huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
alioss
yujialong 2 years ago
parent 6de3eb9d23
commit 588df7ce32
10 changed files with 1649 additions and 1481 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/api/index.js
  2. 11
      src/layouts/header/index.vue
  3. 17
      src/layouts/navbar/index.vue
  4. 70
      src/pages/record/list/ass.vue
  5. 117
      src/pages/record/list/index.vue
  6. 66
      src/pages/record/list/practice.vue
  7. 8
      src/pages/record/show/index.vue
  8. 145
      src/pages/screen/index.vue
  9. 5
      src/pages/station/preview/index.vue
  10. 2
      src/store/modules/project.js

3
src/api/index.js
Unescape View File

@ -35,6 +35,7 @@ export default {
saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save',
updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update',
maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList',
listOfGoods: `nakadai/mall/listOfGoods`,
// 课程笔记
addNote: `nakadai/curriculumNotes/addNote`,
@ -80,6 +81,8 @@ export default {
exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`,
queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId',
editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData',
getSystemIdBySchool: `occupationlab/occupationlab/projectManage/getSystemIdBySchool`,
getSchoolEffectiveCourse: `nakadai/nakadai/curriculum/getSchoolEffectiveCourse`,
// 考核列表
pageStuAssessment: `occupationlab/occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表

11
src/layouts/header/index.vue
Unescape View File

@ -327,7 +327,7 @@ $height: 64px;
border-radius: 6px;
}
}
@media (max-width: 1680px) {
@media (max-width: 1870px) {
.header {
.logo {
left: 20px;
@ -337,4 +337,13 @@ $height: 64px;
}
}
}
@media (max-width: 1550px) {
.header {
.logo {
img {
max-width: 260px;
}
}
}
}
</style>

17
src/layouts/navbar/index.vue
Unescape View File

@ -1,10 +1,17 @@
<template>
<div>
<ul class="nav">
<li v-for="(item, i) in menus" :key="i" :class="{active: active == item.index}" @click="jump(item)">
<li v-for="(item, i) in menus"
:key="i"
:class="{active: active == item.index}"
@click="jump(item)">
{{item.title}}
<ul :class="['children']" v-if="item.index === '/preInfo/list' || item.index === '/info/list'">
<li v-for="(column, i) in columns" :key="i" :class="{active: columnActive === column.id}" @click="toInfo($event, column)">{{ column.name }}</li>
<ul :class="['children']"
v-if="item.index === '/preInfo/list' || item.index === '/info/list'">
<li v-for="(column, i) in columns"
:key="i"
:class="{active: columnActive === column.id}"
@click="toInfo($event, column)">{{ column.name }}</li>
</ul>
</li>
</ul>
@ -202,7 +209,7 @@ export default {
margin: 0 20px;
font-size: 16px;
line-height: 60px;
color: #3F3F3F;
color: #3f3f3f;
white-space: nowrap;
cursor: pointer;
border-bottom: 4px solid transparent;
@ -253,7 +260,7 @@ export default {
}
}
}
@media (max-width: 1680px) {
@media (max-width: 1870px) {
.nav {
left: 55%;
& > li {

70
src/pages/record/list/ass.vue
Unescape View File

@ -1,32 +1,62 @@
<template>
<div>
<el-table
ref="table"
<el-table ref="table"
class="table"
:data="listData"
stripe
>
<el-table-column prop="id" label="次序" width="60" align="center" type="index"></el-table-column>
<el-table-column prop="curriculumName" label="课程名称" align="center"></el-table-column>
<el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="score" width="60" label="得分" align="center"></el-table-column>
<el-table-column prop="className" width="100" label="实验班级" align="center"></el-table-column>
<el-table-column prop="timeSum" width="80" label="耗时" align="center">
stripe>
<el-table-column prop="id"
label="次序"
width="60"
align="center"
type="index"></el-table-column>
<el-table-column prop="curriculumName"
label="课程名称"
align="center"></el-table-column>
<el-table-column prop="experimentalName"
label="考核名称"
align="center"></el-table-column>
<el-table-column prop="projectName"
label="实验项目名称"
align="center"></el-table-column>
<el-table-column prop="score"
width="60"
label="得分"
align="center"></el-table-column>
<el-table-column prop="className"
width="100"
label="实验班级"
align="center"></el-table-column>
<el-table-column prop="timeSum"
width="80"
label="耗时"
align="center">
<template slot-scope="scope">
{{ scope.row.timeSum }}min
</template>
</el-table-column>
<el-table-column prop="startTime" width="160" label="起始时间" align="center"></el-table-column>
<el-table-column prop="submitTime" width="160" label="结束时间" align="center"></el-table-column>
<el-table-column label="操作" width="100" align="center">
<el-table-column prop="startTime"
width="160"
label="起始时间"
align="center"></el-table-column>
<el-table-column prop="submitTime"
width="160"
label="结束时间"
align="center"></el-table-column>
<el-table-column label="操作"
width="100"
align="center">
<template slot-scope="scope">
<el-button type="text" @click="toReport(scope.row)">实验成绩报告</el-button>
<el-button type="text"
@click="toReport(scope.row)">实验成绩报告</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background :current-page="page" layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange"></el-pagination>
<el-pagination background
:current-page="page"
layout="total, prev, pager, next"
:total="total"
@current-change="handleCurrentChange"></el-pagination>
</div>
</div>
</template>
@ -34,7 +64,7 @@
<script>
import { mapActions } from "vuex";
export default {
props: ["curriculumId"],
props: ['mallId', 'curriculumId'],
data () {
return {
listData: [],
@ -44,9 +74,9 @@ export default {
};
},
watch: {
curriculumId: function(val) {
mallId: function (val) {
this.initData();
}
},
},
mounted () {
this.page = 1
@ -71,6 +101,7 @@ export default {
this.$post(this.api.queryAssessmentByStudent, {
pageNum: this.page,
pageSize: this.pageSize,
mallId: this.mallId,
curriculumId: this.curriculumId
}).then(res => {
this.listData = res.page.records;
@ -86,5 +117,4 @@ export default {
</script>
<style lang="scss" scopted>
</style>

117
src/pages/record/list/index.vue
Unescape View File

@ -3,7 +3,8 @@
<div class="wrap">
<div class="block overview">
<h6 class="l-title">
<img src="@/assets/img/record5.png" alt="">
<img src="@/assets/img/record5.png"
alt="">
实验概览
</h6>
<div class="nums">
@ -31,32 +32,47 @@
<div class="block record">
<h6 class="l-title">
<img src="@/assets/img/record6.png" alt="">
<img src="@/assets/img/record6.png"
alt="">
实验记录明细
</h6>
<div class="tool">
<ul class="filter" style="justify-content: space-between;">
<ul class="filter"
style="justify-content: space-between;">
<div class="tabs">
<a class="item" v-for="(item,index) in tabList" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
<a class="item"
v-for="(item, i) in tabs"
:key="i"
:class="{active: item.id == active}"
@click="tabChange(item.id)">{{ item.name }}</a>
</div>
<li style="margin-right: 0">
<label>课程选择：</label>
<el-select v-model="curriculumId">
<el-option
v-for="item in curriculumList"
:key="item.cid"
:label="item.curriculumName"
:value="item.cid"
></el-option>
</el-select>
<el-button style="margin-left: 20px;" type="primary" @click="exportData">导出数据</el-button>
<el-cascader v-model="mallIds"
:options="curs"
:props="{ checkStrictly: true, value: 'id' }"
popper-class="course-cas"
@expand-change="curChange"
@change="curChange"></el-cascader>
<el-button style="margin-left: 20px;"
type="primary"
@click="exportData">导出数据</el-button>
</li>
</ul>
</div>
<practice v-if="active == 'practice'" :curriculumId.sync="curriculumId" :key="curriculumId"></practice>
<ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass>
<practice v-if="!active"
ref="list0"
:mallId.sync="mallId"
:curriculumId.sync="curriculumId"
:key="mallId"></practice>
<ass v-else
ref="list1"
:curriculumId.sync="curriculumId"
:mallId.sync="mallId"
:key="mallId"></ass>
</div>
</div>
</template>
@ -75,6 +91,9 @@ export default {
},
data () {
return {
mallIds: [],
curs: [],
mallId: '',
curriculumId: "",
curriculumList: [
{
@ -83,11 +102,17 @@ export default {
}
],
overview: {},
active: "practice",
tabList: {
practice: "练习",
ass: "考核"
active: 0,
tabs: [
{
id: 0,
name: '练习'
},
{
id: 1,
name: '考核'
},
],
token: util.local.get(Setting.tokenKey),
};
},
@ -96,27 +121,50 @@ export default {
'lastRecordType', 'currId'
])
},
watch: {
mallId: {
handler (val) {
this.curriculumId = this.curs.find(e => e.mallId == val).cid
},
deep: true
}
},
created () {
this.active = this.lastRecordType ? this.lastRecordType : "practice";
this.active = this.lastRecordType ? this.lastRecordType : 0;
},
mounted () {
this.getData();
this.getschoolCourse();
this.getData()
this.getCourse()
},
methods: {
...mapActions({
setRecord: "project/setRecord"
}),
getschoolCourse() { // 获取课程下拉框数据
this.$get(this.api.schoolCourseByAchievement).then(res => {
if (res.data && res.data.length) {
this.curriculumList = [...this.curriculumList, ...res.data]
this.curriculumId = this.currId || this.curriculumList[0].cid
// 获取课程
async getCourse () {
const { data } = await this.$get(this.api.getSystemIdBySchool)
const res = await this.$get(this.api.getSchoolEffectiveCourse)
if (res.data.length) {
res.data.map(e => {
e.id = e.mallId
e.label = e.curriculumName
e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
})
this.curs = res.data
this.mallIds = [res.data[0].mallId, data[0].id]
this.mallId = res.data[0].mallId
}
}).catch(err => {
console.log(err);
});
},
// 课程选择回调
curChange (val) {
const id = val[0]
if (val.length === 1) {
// 如果选择的是课程，则默认选中下面第一个系统
this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
}
this.mallId = id
},
getData () { // 获取实验概览数据
this.$get(this.api.experimentOverview).then(res => {
this.overview = res.data;
@ -145,10 +193,9 @@ export default {
}).catch(res => { })
}
},
tabChange(index) {
this.active = index;
this.setRecord(index)
// this.$store.dispatch('project/setRecord', index)
tabChange (id) {
this.active = id
this.setRecord(id)
}
},
@ -219,7 +266,7 @@ export default {
line-height: 34px;
border-radius: 4px;
background-color: #fff;
border: 1px solid #CACFDB;
border: 1px solid #cacfdb;
cursor: pointer;
&.active {
color: #fff;

66
src/pages/record/list/practice.vue
Unescape View File

@ -1,21 +1,50 @@
<template>
<div>
<el-table :data="listData" stripe>
<el-table-column prop="id" label="次序" width="60" align="center" type="index"></el-table-column>
<el-table-column prop="curriculumName" label="课程名称" align="center"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="hightScore" width="120" label="实验最高得分" align="center"></el-table-column>
<el-table-column prop="practiceNum" label="练习次数" width="80" align="center"></el-table-column>
<el-table-column prop="duration" width="140" label="累计实验时长（小时）" align="center"></el-table-column>
<el-table-column prop="lastTime" width="160" label="最近实验时间" align="center"></el-table-column>
<el-table-column prop="creationTime" width="90" label="操作" align="center">
<el-table :data="listData"
stripe>
<el-table-column prop="id"
label="次序"
width="60"
align="center"
type="index"></el-table-column>
<el-table-column prop="curriculumName"
label="课程名称"
align="center"></el-table-column>
<el-table-column prop="projectName"
label="实验项目名称"
align="center"></el-table-column>
<el-table-column prop="hightScore"
width="120"
label="实验最高得分"
align="center"></el-table-column>
<el-table-column prop="practiceNum"
label="练习次数"
width="80"
align="center"></el-table-column>
<el-table-column prop="duration"
width="140"
label="累计实验时长（小时）"
align="center"></el-table-column>
<el-table-column prop="lastTime"
width="160"
label="最近实验时间"
align="center"></el-table-column>
<el-table-column prop="creationTime"
width="90"
label="操作"
align="center">
<template slot-scope="scope">
<el-button type="text" @click="toDetails(scope.row)">实验情况</el-button>
<el-button type="text"
@click="toDetails(scope.row)">实验情况</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background :current-page="page" layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange"></el-pagination>
<el-pagination background
:current-page="page"
layout="total, prev, pager, next"
:total="total"
@current-change="handleCurrentChange"></el-pagination>
</div>
</div>
</template>
@ -23,7 +52,7 @@
<script>
import { mapActions } from "vuex";
export default {
props: ["curriculumId"],
props: ['mallId', 'curriculumId'],
data () {
return {
listData: [],
@ -33,13 +62,12 @@ export default {
};
},
watch: {
curriculumId: function(val) {
mallId: function (val) {
this.initData();
}
},
},
mounted () {
this.page = 1
this.getData()
this.initData()
},
methods: {
...mapActions({
@ -60,12 +88,17 @@ export default {
this.$post(this.api.queryPracticeByStudent, {
pageNum: this.page,
pageSize: this.pageSize,
mallId: this.mallId,
curriculumId: this.curriculumId
}).then(res => {
this.listData = res.page.records;
this.total = res.page.total;
}).catch(err => { });
},
initData () {
this.page = 1
this.getData()
},
toDetails (row) {
this.setCurriculum(this.curriculumId)
this.$router.push(`/record/details?curriculumId=${row.curriculumId}&projectId=${row.projectId}`);
@ -75,5 +108,4 @@ export default {
</script>
<style lang="scss" scoped>
</style>

8
src/pages/record/show/index.vue
Unescape View File

@ -142,7 +142,7 @@
label="判分点"
width="200"
align="center"></el-table-column>
<el-table-column v-if='project'
<el-table-column v-if="project"
prop="judgmentName"
label="考核点"
align="center"
@ -172,7 +172,8 @@
v-html="scope.row.referenceAnswer"></div>
</template>
</el-table-column>
<el-table-column prop="userAnswer"
<el-table-column v-if="!project"
prop="userAnswer"
label="学生答案">
<template slot-scope="scope">
<div v-if='scope.row.lcRuleRecords'>
@ -331,9 +332,8 @@ export default {
})
} else { // python系统显示图片（从userScores里取）
list.forEach(e => {
// e.runResult = e.runResult
const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
if (item && item.runThePictureList) {
if (item) {
if (item.runThePictureList) e.runThePictureList = item.runThePictureList
if (item.runResult) e.runResult = item.runResult
}

145
src/pages/screen/index.vue
Unescape View File

@ -1,7 +1,10 @@
<template>
<div class="wrap">
<!-- 全屏 -->
<img class="full" src="@/assets/img/screen/full.png" alt="" @click="fullScreen">
<img class="full"
src="@/assets/img/screen/full.png"
alt=""
@click="fullScreen">
<!--header-->
<div class="header">
<div class="bg_header">
@ -34,13 +37,18 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_1.png" alt="">
<img src="@/assets/img/screen/t_1.png"
alt="">
平台考试数据统计
</div>
<ul class="time-switch">
<li v-for="(item, i) in times" :key="i" :class="{active: item.id === time}" @click="switchTime(item.id)">{{ item.name }}</li>
<li v-for="(item, i) in times"
:key="i"
:class="{active: item.id === time}"
@click="switchTime(item.id)">{{ item.name }}</li>
</ul>
<div id="chart1" class="chart"></div>
<div id="chart1"
class="chart"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -60,10 +68,12 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_2.png" alt="">
<img src="@/assets/img/screen/t_2.png"
alt="">
学生成绩分布分析
</div>
<div id="chart2" class="chart t_btn9"></div>
<div id="chart2"
class="chart t_btn9"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -83,10 +93,12 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
月人均在线学习时长情况
</div>
<div id="chart3" class="chart t_btn9"></div>
<div id="chart3"
class="chart t_btn9"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -106,14 +118,17 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
平台登录人数
</div>
<div id="chart4" class="chart t_btn9"></div>
<div id="chart4"
class="chart t_btn9"></div>
</div>
</div>
<div class="middle">
<div class="item" style="height: 620px">
<div class="item"
style="height: 620px">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -134,8 +149,15 @@
<i class="r_b_line"></i>
<i class="b_r_line"></i>
</div>
<video class="video" ref="video" width="100%" height="100%" autoplay muted loop>
<source src="@/assets/videos/screen.mp4" type="video/mp4">
<video class="video"
ref="video"
width="100%"
height="100%"
autoplay
muted
loop>
<source src="@/assets/videos/screen.mp4"
type="video/mp4">
您的浏览器不支持 video 标签。
</video>
<div class="stat-mask"></div>
@ -151,7 +173,8 @@
<p class="name">当前活跃人数</p>
</div>
</div>
<div class="item" style="height: 440px;">
<div class="item"
style="height: 440px;">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -173,14 +196,18 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_3.png" alt="">
<img src="@/assets/img/screen/t_3.png"
alt="">
学生实验课程考核成绩趋势图
</div>
<div class="chart" id="chart5" style="height: 420px"></div>
<div class="chart"
id="chart5"
style="height: 420px"></div>
</div>
</div>
<div class="right">
<div class="item" style="height: 160px">
<div class="item"
style="height: 160px">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -202,18 +229,23 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_4.png" alt="">
<img src="@/assets/img/screen/t_4.png"
alt="">
本月综合学习积极性最高的实验课程
</div>
<ul class="list">
<li v-for="(item, i) in courses" :key="i">
<li v-for="(item, i) in courses"
:key="i">
<span class="index">{{ i + 1 }}</span>
<p class="text">{{ item.curriculumName }}</p>
<img class="icon" src="@/assets/img/screen/medal.png" alt="">
<p class="text">{{ item.goodsName }}</p>
<img class="icon"
src="@/assets/img/screen/medal.png"
alt="">
</li>
</ul>
</div>
<div class="item" style="height: 240px">
<div class="item"
style="height: 240px">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -235,19 +267,23 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_5.png" alt="">
<img src="@/assets/img/screen/t_5.png"
alt="">
热门理论课程排行榜
</div>
<div class="popular-wrap" ref="popularCourses">
<div class="popular-wrap"
ref="popularCourses">
<ul class="list popular">
<li v-for="(item, i) in popularCourses" :key="i">
<li v-for="(item, i) in popularCourses"
:key="i">
<span class="index">{{ i + 1 }}</span>
<p class="text">{{ item }}</p>
</li>
</ul>
</div>
</div>
<div class="item" style="height: 300px">
<div class="item"
style="height: 300px">
<div class="t_line_box">
<i class="t_l_line"></i>
<i class="l_t_line"></i>
@ -265,7 +301,8 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
学霸排行榜
</div>
<div class="main_table">
@ -281,10 +318,13 @@
</thead>
</table>
</div>
<div class="main_table" ref="ach" style="max-height: 220px;margin-top: 0;overflow: hidden">
<div class="main_table"
ref="ach"
style="max-height: 222px;margin-top: 0;overflow: hidden">
<table>
<tbody>
<tr v-for="(item, i) in achs" :key="i">
<tr v-for="(item, i) in achs"
:key="i">
<td width="20%">{{ i + 1 }}</td>
<td width="20%">{{ item.userName }}</td>
<td width="20%">{{ token ? item.className : item.schoolName }}</td>
@ -295,7 +335,8 @@
</table>
</div>
</div>
<div class="item" style="height: 300px">
<div class="item"
style="height: 300px">
<div class="t_line_box">
<i class="t_l_line"></i>
<i class="l_t_line"></i>
@ -313,7 +354,8 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
活跃度排行榜
</div>
<div class="main_table">
@ -327,10 +369,13 @@
</thead>
</table>
</div>
<div class="main_table" ref="active" style="max-height: 230px;margin-top: 0;overflow: hidden">
<div class="main_table"
ref="active"
style="max-height: 230px;margin-top: 0;overflow: hidden">
<table>
<tbody>
<tr v-for="(item, i) in actives" :key="i">
<tr v-for="(item, i) in actives"
:key="i">
<td width="20%">{{ i + 1 }}</td>
<td width="20%">{{ token ? item.className : item.schoolName }}</td>
<td width="20%">{{ item.activityIndex }}</td>
@ -702,30 +747,24 @@ export default {
}
]
// 登录前登录后调的课程接口不一样
const cousrseRes = this.token ?
await this.$get(this.api.schoolCourse) :
await this.$post(this.api.curriculumListForBeforeLogin, {
const cousrseRes = await this.$post(this.api.listOfGoods, {
pageNum: 1,
pageSize: 100,
supplierId: '1,2,3,4',
curriculumName: '',
categoryId: '',
curriculumType: '',
professionalCategoryId: '',
professionalId: '',
pageSize: 1000,
sort: 0,
isShelves: 0,
hotTag: 1,
})
if (cousrseRes) {
const courseList = this.token ?
cousrseRes.data :
const courseList =
cousrseRes.page.records
const ids = courseList.map(e => e.cid)
const ids = courseList.map(e => e.mallId)
times.map(e => {
e.cid = ids
e.mallId = ids
})
const courseData = {}
courseList.map(e => {
// e.curriculumName = e.curriculumName.substring(0, 10)
courseData[e.curriculumName] = []
// e.productName = e.productName.substring(0, 10)
courseData[e.productName] = []
})
this.$post(this.api.studentAssessSchievement, times).then(({ data }) => {
const times = []
@ -733,9 +772,9 @@ export default {
data.map((e, i) => {
times.push(e.time)
e.assesScoreRespList.map(n => {
const item = courseList.find(j => j.cid == n.curriculumId)
const item = courseList.find(j => j.mallId == n.mallId)
if (item) {
const name = item.curriculumName
const name = item.productName
if (courseData[name]) {
courseData[name][i] = +n.avgScore
}
@ -792,7 +831,7 @@ export default {
},
legend: {
top: '8%',
data: courseList.map(e => e.curriculumName),
data: courseList.map(e => e.productName),
textStyle: {
color: 'rgba(255,255,255,.5)',
fontSize: '12',
@ -1101,5 +1140,5 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../styles/page/screen.scss";
@import '../../styles/page/screen.scss';
</style>

5
src/pages/station/preview/index.vue
Unescape View File

@ -594,7 +594,7 @@ export default {
},
// 获取学习进度
async getProgress () {
let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}`);
let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
this.progressList = res.list
if (res.list.length) this.archProject = res.list[0].projectId
this.maximumScores.length || this.getMaximumScore()
@ -906,6 +906,7 @@ export default {
this.$get(this.api.getProjectBySystemId, {
systemId: this.systemIds,
cId: this.courseId, // 课程id
mallId: this.mallId,
permissions: 0 // 0: 练习,1: 考核
}).then(({ projects }) => {
this.loading = false
@ -971,7 +972,7 @@ export default {
location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true`
} else if (systemId == 12) {
// 众筹系统
window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`);
window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}`);
} else if (systemId == 21) {
window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
} else if (systemId == 22) {

2
src/store/modules/project.js
Unescape View File

@ -5,7 +5,7 @@ export default {
namespaced: true,
state: {
currId: '',
lastRecordType: "practice",
lastRecordType: 0,
courseId: ''
},
mutations: {

Write Preview
Loading…
Cancel
Save