huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 15 Wiki Activity

fix

Browse Source
dev_202412
yujialong 3 months ago
parent 1d800d91b2
commit e467d90550
5 changed files with 310 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/const/source.js
  2. 90
      src/views/course/content/source.vue
  3. 74
      src/views/match/add/set.vue
  4. 4
      src/views/match/add/step3.vue
  5. 10
      src/views/match/manage/trialReport.vue

28
src/const/source.js
Unescape View File

@ -0,0 +1,28 @@
export default {
types: [
{
id: 1,
name: '演示文稿类'
},
{
id: 2,
name: '视频类'
},
{
id: 3,
name: '图形类'
},
{
id: 4,
name: '文本类'
},
{
id: 5,
name: '音频类'
},
{
id: 6,
name: '其他'
},
],
}

90
src/views/course/content/source.vue
Unescape View File

@ -1,16 +1,18 @@
<template> <template>
<el-drawer title="添加系统资源" :visible.sync="sourceVisible" size="1200px" :close-on-click-modal="false" <el-drawer title="添加系统资源" :visible.sync="sourceVisible" size="1200px" :close-on-click-modal="false"
custom-class="source-dia" @closed="closeDia"> custom-class="source-dia" @closed="closeDia">
<div class="overflow"> <div class="overflow" v-loading="loading">
<div class="left"> <div class="left">
<el-input style="width: 300px" placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="keyword"
clearable></el-input>
<div class="tabs mgb20"> <div class="tabs mgb20">
<a class="item" v-for="(item, i) in tabs" :key="i" :class="{ active: i == active }" @click="tabChange(i)">{{ <a class="item" v-for="(item, i) in tabs" :key="i" :class="{ active: i == active }" @click="tabChange(i)">{{
item item
}}</a> }}</a>
</div> </div>
<template v-if="active !== 'tab3'">
<el-input class="mgb10" style="width: 300px" placeholder="请输入资源名称" prefix-icon="el-icon-search"
v-model="keyword" clearable></el-input>
<div class="course"> <div class="course">
<div v-for="(course, i) in course" :key="i" class="item"> <div v-for="(course, i) in course" :key="i" class="item">
<div class="line"> <div class="line">
@ -51,6 +53,38 @@
</div> </div>
</div> </div>
</div> </div>
</template>
<!-- 文件素材 -->
<div v-else class="materials">
<div class="types">
<div class="flex-center m-b-10">
<p class="addhr_tag"></p>
<span>资源类型</span>
</div>
<ul class="lines">
<li v-for="(item, i) in sourceType" :key="i" class="line">
<el-checkbox v-model="item.check" :label="item.name"
@change="val => typeChange(val, item)"></el-checkbox>
</li>
</ul>
</div>
<div class="sources">
<div class="flex-center m-b-10">
<p class="addhr_tag"></p>
<span>资源列表</span>
</div>
<el-input placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="checkedKeyword" clearable></el-input>
<ul class="lines">
<el-checkbox v-if="sources.length" v-model="checkAll" label="全选" @change="checkAllChange"></el-checkbox>
<li v-for="(item, i) in sources" :key="i" class="line">
<el-checkbox v-model="item.check" :label="item.name"
@change="val => sourceChange(val, item)"></el-checkbox>
</li>
</ul>
</div>
</div>
</div> </div>
<div class="right"> <div class="right">
<div v-if="$parent.curSection.id" class="m-b-20"> <div v-if="$parent.curSection.id" class="m-b-20">
@ -98,6 +132,7 @@
import Setting from '@/setting' import Setting from '@/setting'
import Util from '@/libs/util' import Util from '@/libs/util'
import _ from 'lodash' import _ from 'lodash'
import SourceConst from '@/const/source'
export default { export default {
props: ['visible'], props: ['visible'],
data () { data () {
@ -109,6 +144,9 @@ export default {
tab2: '精品课程', tab2: '精品课程',
tab3: '文件素材', tab3: '文件素材',
}, },
sourceType: SourceConst.types,
sources: [],
checkAll: false,
keyword: '', keyword: '',
searchTimer: null, searchTimer: null,
checkedKeyword: '', checkedKeyword: '',
@ -118,7 +156,7 @@ export default {
checked: [], checked: [],
submiting: false, submiting: false,
loaded: 0, loading: false,
}; };
}, },
watch: { watch: {
@ -142,6 +180,8 @@ export default {
}, },
// 课程列表 // 课程列表
async getCourse () { async getCourse () {
try {
this.loading = true
const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`) const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`)
if (list.length) { if (list.length) {
const all = [] const all = []
@ -162,6 +202,9 @@ export default {
this.allSections = all this.allSections = all
} }
this.course = list this.course = list
} finally {
this.loading = false
}
}, },
initData () { initData () {
this.page = 1; this.page = 1;
@ -227,6 +270,21 @@ export default {
} }
chapter.check = chapter.subsections.every(e => e.check) chapter.check = chapter.subsections.every(e => e.check)
}, },
// 资源类型选择回调
typeChange (val, item) {
},
// 资源全选回调
checkAllChange (val, systemId) {
// this.systemChange(val, { systemId })
// this.systems.map(e => {
// if (e.systemId == systemId) e.check = val
// })
},
// 资源列表选择回调
sourceChange (val, item) {
},
// 批量移除 // 批量移除
async batchDelChecked (val) { async batchDelChecked (val) {
@ -341,8 +399,7 @@ export default {
.left { .left {
width: 700px; width: 700px;
padding: 0 20px; padding: 0 15px;
padding: 15px;
border-right: 1px solid #eee; border-right: 1px solid #eee;
box-sizing: border-box; box-sizing: border-box;
@ -457,5 +514,26 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.materials {
display: flex;
gap: 20px;
}
.types {
width: 250px;
padding: 10px;
background-color: #f9f9f9;
box-sizing: border-box;
.line {
margin-bottom: 5px;
}
}
.sources {
flex: 1;
padding: 10px;
}
} }
</style> </style>

74
src/views/match/add/set.vue
Unescape View File

@ -34,17 +34,28 @@
</el-radio-group> </el-radio-group>
<div class="inline-input"> <div class="inline-input">
<el-select v-model="libraryId" placeholder="请选择试卷库" @change="getProject"> <!-- 理论 && 选择课程 -->
<el-select v-if="isTheory && !courseSystem" v-model="libraryId" placeholder="请选择试卷库" @change="getProject">
<el-option v-for="(item, i) in paperLibraries" :key="i" :label="item.libraryName" :value="item.libraryId"> <el-option v-for="(item, i) in paperLibraries" :key="i" :label="item.libraryName" :value="item.libraryId">
</el-option> </el-option>
</el-select> </el-select>
<!-- 实训 && 选择课程 -->
<el-cascader v-else-if="!isTheory && !courseSystem" ref="cur" v-model="mallIds" :options="curs"
:props="{ checkStrictly: true, value: 'id' }" popper-class="course-cas" @expand-change="curChange"
@change="curChange"></el-cascader>
<!-- 实训 && 选择系统 -->
<el-select v-else-if="!isTheory && courseSystem" v-model="systemId" placeholder="请选择系统" @change="getProject">
<el-option v-for="(item, i) in services" :key="i" :label="item.systemName" :value="item.systemId">
</el-option>
</el-select>
</div> </div>
</div> </div>
</el-card> </el-card>
<!-- 理论系统 --> <!-- 理论系统 -->
<template v-if="isTheory"> <el-card v-if="isTheory" shadow="hover" class="m-b-20">
<el-card shadow="hover" class="m-b-20">
<div class="flex-between m-b-20"> <div class="flex-between m-b-20">
<span>理论试卷</span> <span>理论试卷</span>
<div style="display: inline-flex;"> <div style="display: inline-flex;">
@ -93,21 +104,8 @@
layout="total,prev, pager, next" :total="total"></el-pagination> layout="total,prev, pager, next" :total="total"></el-pagination>
</div> </div>
</el-card> </el-card>
</template>
<template v-else> <el-card v-else shadow="hover" class="m-b-20">
<el-card shadow="hover" class="mgr20 m-b-20">
<div>
<p class="m-b-20">课程</p>
<div class="inline-input">
<el-cascader ref="cur" v-model="mallIds" :options="curs" :props="{ checkStrictly: true, value: 'id' }"
popper-class="course-cas" @expand-change="curChange" @change="curChange"></el-cascader>
</div>
</div>
</el-card>
<el-card shadow="hover" class="m-b-20">
<div class="flex-between m-b-20"> <div class="flex-between m-b-20">
<span>实训项目</span> <span>实训项目</span>
<div style="display: inline-flex;"> <div style="display: inline-flex;">
@ -147,7 +145,6 @@
layout="total,prev, pager, next" :total="total"></el-pagination> layout="total,prev, pager, next" :total="total"></el-pagination>
</div> </div>
</el-card> </el-card>
</template>
<div style="text-align: center"> <div style="text-align: center">
<el-button @click="back">返回</el-button> <el-button @click="back">返回</el-button>
@ -158,7 +155,7 @@
<script> <script>
import Setting from '@/setting' import Setting from '@/setting'
import util from "@/libs/util"; import Util from '@/libs/util'
import { Loading } from 'element-ui' import { Loading } from 'element-ui'
import TestPaperConst from '@/const/testPaper' import TestPaperConst from '@/const/testPaper'
export default { export default {
@ -169,9 +166,10 @@ export default {
paperTypes: TestPaperConst.paperTypes, paperTypes: TestPaperConst.paperTypes,
loadIns: null, loadIns: null,
mallIds: [], mallIds: [],
systemId: '',
curs: [], curs: [],
paperLibraries: [], paperLibraries: [],
testPapers: [], services: [],
keyword: '', keyword: '',
projects: [], projects: [],
page: 1, page: 1,
@ -214,11 +212,17 @@ export default {
// 获取课程 // 获取课程
async getCourse () { async getCourse () {
const sid = this.$store.state.dataPer.find(e => e.permissionName === '服务配置') const sid = this.$store.state.dataPer.find(e => e.permissionName === '服务配置')
const { serviceList } = await this.$post(this.api.queryServiceConfig, { // 查询服务器列表
const res = await this.$post(this.api.queryServiceConfig, {
pageNum: 1, pageNum: 1,
pageSize: 1000, pageSize: 1000,
supplierId: sid ? sid.supplierId : '' supplierId: sid ? sid.supplierId : ''
}) })
const services = res.serviceList.records
this.services = services
this.systemId = services[0].systemId
// 查询产品列表
const { page } = await this.$post(this.api.listOfGoods, { const { page } = await this.$post(this.api.listOfGoods, {
pageNum: 1, pageNum: 1,
pageSize: 10000, pageSize: 10000,
@ -230,14 +234,14 @@ export default {
const { records } = page const { records } = page
const { mallId, cid, systemId } = this.form const { mallId, cid, systemId } = this.form
if (records.length) { if (records.length) {
serviceList.records.map(e => { services.map(e => {
e.id = +e.systemId e.id = +e.systemId
e.label = e.systemName e.label = e.systemName
}) })
records.map(e => { records.map(e => {
e.id = +e.mallId e.id = +e.mallId
e.label = e.productName e.label = e.productName
e.children = serviceList.records.filter(n => e.systemId && e.systemId.split(',').includes(n.systemId)) // 筛选出该课程下的系统 e.children = services.filter(n => e.systemId && e.systemId.split(',').includes(n.systemId)) // 筛选出该课程下的系统
}) })
this.curs = records this.curs = records
@ -302,8 +306,13 @@ export default {
}) })
this.projects = res.pageList.records this.projects = res.pageList.records
this.total = res.pageList.total this.total = res.pageList.total
} else { // 实训
// 根据系统查询项目
if (this.courseSystem) {
const res = await this.$get(`${this.api.getInternalProjectBySystemId}?permissions=2&systemId=${this.systemId}&keyword=${this.keyword}`)
this.projects = res
} else { } else {
// 实训查询项目 // 根据课程查询项目
const { data } = await this.$post(this.api.getProjectAssessmentByCompetition, { const { data } = await this.$post(this.api.getProjectAssessmentByCompetition, {
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
@ -315,6 +324,7 @@ export default {
this.projects = data.records this.projects = data.records
this.total = data.total this.total = data.total
} }
}
} finally { } finally {
this.loadIns.close() this.loadIns.close()
} }
@ -345,7 +355,7 @@ export default {
const { playStartTime, playEndTime } = this.step1 const { playStartTime, playEndTime } = this.step1
if (startTime < new Date(playStartTime) || endTime > new Date(playEndTime)) { if (startTime < new Date(playStartTime) || endTime > new Date(playEndTime)) {
this.timeInvalid = true this.timeInvalid = true
return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。') return Util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
} }
this.timeInvalid = false this.timeInvalid = false
const { form, curStep } = this.$parent const { form, curStep } = this.$parent
@ -355,7 +365,7 @@ export default {
const time1 = new Date(form[i].startTime) const time1 = new Date(form[i].startTime)
const time2 = new Date(form[i].endTime) const time2 = new Date(form[i].endTime)
if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) { if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。') Util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
break break
} }
} }
@ -374,20 +384,20 @@ export default {
// 提交 // 提交
save () { save () {
const { form } = this const { form } = this
if (!form.time.length) return util.warningMsg('请选择比赛时间') if (!form.time.length) return Util.warningMsg('请选择比赛时间')
const { playStartTime, playEndTime } = this.step1 const { playStartTime, playEndTime } = this.step1
if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。') if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return Util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
// 理论试卷存试卷库等 // 理论试卷存试卷库等
if (this.isTheory) { if (this.isTheory) {
if (!this.libraryId) return util.warningMsg('请选择试卷库') if (!this.libraryId) return Util.warningMsg('请选择试卷库')
if (!form.paperId) return util.warningMsg('请选择试卷') if (!form.paperId) return Util.warningMsg('请选择试卷')
form.libraryId = this.libraryId form.libraryId = this.libraryId
const curPaper = this.projects.find(e => e.paperId === form.paperId) const curPaper = this.projects.find(e => e.paperId === form.paperId)
if (curPaper) form.paperName = curPaper.name if (curPaper) form.paperName = curPaper.name
} else { } else {
if (!form.cid) return util.warningMsg('请选择课程') if (!form.cid) return Util.warningMsg('请选择课程')
if (!form.projectId) return util.warningMsg('请选择项目') if (!form.projectId) return Util.warningMsg('请选择项目')
const { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId) const { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
if (systemId) form.systemId = systemId if (systemId) form.systemId = systemId
if (projectName) form.projectName = projectName if (projectName) form.projectName = projectName

4
src/views/match/add/step3.vue
Unescape View File

@ -79,8 +79,7 @@
{{ item.projectName }} {{ item.projectName }}
</el-form-item> </el-form-item>
</template> </template>
<template v-else> <el-form-item v-else class="req" label="已选择试卷">
<el-form-item class="req" label="已选择试卷">
<div class="flex"> <div class="flex">
{{ item.paperName }}&emsp; {{ item.paperName }}&emsp;
<el-form> <el-form>
@ -89,7 +88,6 @@
</el-form> </el-form>
</div> </div>
</el-form-item> </el-form-item>
</template>
<el-form-item class="req" prop="resultAnnouncementTime" label="比赛地点"> <el-form-item class="req" prop="resultAnnouncementTime" label="比赛地点">
<div class="line"> <div class="line">
<el-checkbox v-model="item.onlineButton">线上</el-checkbox> <el-checkbox v-model="item.onlineButton">线上</el-checkbox>

10
src/views/match/manage/trialReport.vue
Unescape View File

@ -6,7 +6,7 @@
<div class="content" v-loading="loading"> <div class="content" v-loading="loading">
<div class="text-right"> <div class="text-right">
<el-button type="primary" @click="exportPage">导出报告</el-button> <el-button type="primary" :loading="exporting" @click="exportPage">导出报告</el-button>
</div> </div>
<h6 class="r-title">标准实验报告</h6> <h6 class="r-title">标准实验报告</h6>
<div class="info"> <div class="info">
@ -155,7 +155,7 @@ export default {
infoData: {}, infoData: {},
expData: [], expData: [],
editing: false, editing: false,
loadIns: null, exporting: false,
loading: false, loading: false,
project: false, project: false,
userScores: [] userScores: []
@ -222,6 +222,7 @@ export default {
this.loading = false this.loading = false
}, },
exportPage () { exportPage () {
this.exporting = true
const form = Object.assign(this.form, this.infoData) const form = Object.assign(this.form, this.infoData)
const list = JSON.parse(JSON.stringify(this.expData)) const list = JSON.parse(JSON.stringify(this.expData))
list.map((e, i) => { list.map((e, i) => {
@ -242,7 +243,10 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
util.downloadFileDirect(`实验报告.docx`, new Blob([res])) util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
}).catch(res => { }) this.exporting = false
}).catch(res => {
this.exporting = false
})
}, },
} }
}; };

Write Preview
Loading…
Cancel
Save