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
Unified 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. 473
      src/layouts/navbar/index.vue
  4. 178
      src/pages/record/list/ass.vue
  5. 325
      src/pages/record/list/index.vue
  6. 154
      src/pages/record/list/practice.vue
  7. 8
      src/pages/record/show/index.vue
  8. 1971
      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', saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save',
updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update', updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update',
maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList', maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList',
listOfGoods: `nakadai/mall/listOfGoods`,
// 课程笔记 // 课程笔记
addNote: `nakadai/curriculumNotes/addNote`, addNote: `nakadai/curriculumNotes/addNote`,
@ -80,6 +81,8 @@ export default {
exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`, exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`,
queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId', queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId',
editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData', editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData',
getSystemIdBySchool: `occupationlab/occupationlab/projectManage/getSystemIdBySchool`,
getSchoolEffectiveCourse: `nakadai/nakadai/curriculum/getSchoolEffectiveCourse`,
// 考核列表 // 考核列表
pageStuAssessment: `occupationlab/occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表 pageStuAssessment: `occupationlab/occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表

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

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

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

@ -1,14 +1,21 @@
<template> <template>
<div> <div>
<ul class="nav"> <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"
{{item.title}} :key="i"
<ul :class="['children']" v-if="item.index === '/preInfo/list' || item.index === '/info/list'"> :class="{active: active == item.index}"
<li v-for="(column, i) in columns" :key="i" :class="{active: columnActive === column.id}" @click="toInfo($event, column)">{{ column.name }}</li> @click="jump(item)">
</ul> {{item.title}}
</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> </ul>
</div> </li>
</ul>
</div>
</template> </template>
<script> <script>
@ -16,248 +23,248 @@ import Setting from "@/setting"
import util from "@/libs/util" import util from "@/libs/util"
import { mapActions } from "vuex"; import { mapActions } from "vuex";
export default { export default {
data() { data () {
return { return {
token: util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
isTourist: false, isTourist: false,
active: '/' + this.$route.path.split('/')[1] + '/list', active: '/' + this.$route.path.split('/')[1] + '/list',
// 登录后的菜单 // 登录后的菜单
loginedMenu: [ loginedMenu: [
{ {
index: "/station/list", index: "/station/list",
title: "实验台" title: "实验台"
}, },
{ {
index: "/appraisal/list", index: "/appraisal/list",
title: "能力测评" title: "能力测评"
}, },
{ {
index: "/record/list", index: "/record/list",
title: "实验记录" title: "实验记录"
}, },
{ {
index: "/ass/list", index: "/ass/list",
title: "考核列表" title: "考核列表"
}, },
{ {
index: "/course/list", index: "/course/list",
title: "课程学习" title: "课程学习"
}, },
{ {
index: "/info/list", index: "/info/list",
title: "最新资讯" title: "最新资讯"
}, },
{ {
index: "/match/list", index: "/match/list",
title: "线上赛事" title: "线上赛事"
}, },
{ {
index: "/activity/list", index: "/activity/list",
title: "创业活动" title: "创业活动"
}, },
{ {
index: "/screen", index: "/screen",
title: "数据看板" title: "数据看板"
}
],
// 游客菜单
touristMenu: [
{
index: "/index/list",
title: "首页"
},
{
index: "/touristMatch/list",
title: "大赛资讯"
},
{
index: "/preCourse/list",
title: "精品课程"
},
{
index: "/preInfo/list",
title: "最新资讯"
},
{
index: 'data',
title: "数据科研"
},
{
index: "/log/list",
title: "更新日志"
},
{
index: "/screen",
title: "数据看板"
}
// {
// index: "trial",
// title: "试用申请"
// }
],
menus: [],
columns: [
{
id: 0,
name: '平台资讯'
}
], // 资讯一级栏目
columnActive: this.$route.query.parentId
};
},
watch: {
"$route"(to, from) {
let actives = this.actives;
for (let i in this.actives) {
if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`;
}
let arr=this.$route.path.split("/");
let name = `/${arr[1]}/list`
this.active = name;
}
},
mounted() {
const path = this.$route.path
this.isTourist = !!Setting.whiteList.find(e => e === path)
// 如果当前页面是在白名单页面，则用游客菜单
if (this.isTourist) {
// 如果是智信云的网站，则显示产品服务
const menus = this.touristMenu
if (Setting.isZxy) {
menus[0].index = '/index/zxy'
menus.splice(1, 0, {
index: '/product',
title: '产品服务'
})
}
this.menus = menus
} else {
this.menus = this.loginedMenu
} }
this.isTourist || this.getColumns() ],
}, // 游客菜单
methods: { touristMenu: [
...mapActions("info", [ {
"setColumnId" index: "/index/list",
]), title: "首页"
// 跳转 },
jump(item) { {
const { index } = item index: "/touristMatch/list",
// 数据科研点击后打开新窗口去到数据平台 title: "大赛资讯"
if (index === 'data') {
window.open(Setting.isDev
? `http://192.168.31.125:8092/#/`
: Setting.isTest
? location.origin
: `https://www.dataforward.cn`)
} else if (index === 'trial') {
// 申请试用
// window.open('https://www.wjx.cn/vm/wB0RcMm.aspx')
} else if (index === '/screen') {
// 数据看板
window.open(this.$router.resolve('/screen').href)
} else {
const token = util.local.get(Setting.tokenKey)
// 如果未登录且跳转的是登录后才有的菜单
if (!token && this.loginedMenu.find(e => e.index === index)) {
location.reload()
} else {
this.active = index
this.columnActive = ''
this.setColumnId('')
index === '/preInfo/list' || index === '/info/list' || this.$router.push(index).catch(err => {})
token !== this.token && location.reload() // 如果登录后再返回该页面，浏览器里会存有token，但是这个页面里的token是刚进到页面时获取的，应该是空，如果是这个情况，则刷新，否则右上角还会显示为登录按钮
}
}
}, },
// 获取资讯一级栏目 {
getColumns() { index: "/preCourse/list",
this.$get(this.api.queryAllColumns).then(({ columnTree }) => { title: "精品课程"
this.columns.push(...columnTree)
}).catch(res => {})
}, },
// 一级栏目点击回调 {
toInfo(e, column) { index: "/preInfo/list",
e.stopPropagation() title: "最新资讯"
const { id } = column },
const path = this.isTourist ? 'preInfo' : 'info' {
this.active = `/${path}/list` index: 'data',
this.columnActive = id title: "数据科研"
this.$router.push(`/${path}/list?parentId=${id || ''}&name=${column.name}`) },
{
index: "/log/list",
title: "更新日志"
},
{
index: "/screen",
title: "数据看板"
} }
// {
// index: "trial",
// title: "试用申请"
// }
],
menus: [],
columns: [
{
id: 0,
name: '平台资讯'
}
], // 资讯一级栏目
columnActive: this.$route.query.parentId
};
},
watch: {
"$route" (to, from) {
let actives = this.actives;
for (let i in this.actives) {
if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`;
}
let arr = this.$route.path.split("/");
let name = `/${arr[1]}/list`
this.active = name;
} }
}; },
</script> mounted () {
const path = this.$route.path
<style lang="scss" scoped> this.isTourist = !!Setting.whiteList.find(e => e === path)
.nav{ // 如果当前页面是在白名单页面，则用游客菜单
position: absolute; if (this.isTourist) {
top: 0; // 如果是智信云的网站，则显示产品服务
left: 50%; const menus = this.touristMenu
display: flex; if (Setting.isZxy) {
transform: translateX(-50%); menus[0].index = '/index/zxy'
& > li{ menus.splice(1, 0, {
position: relative; index: '/product',
padding: 0 15px; title: '产品服务'
margin: 0 20px; })
font-size: 16px; }
line-height: 60px; this.menus = menus
color: #3F3F3F; } else {
white-space: nowrap; this.menus = this.loginedMenu
cursor: pointer;
border-bottom: 4px solid transparent;
&.active{
color: $main-color;
border-bottom-color: $main-color;
} }
&:hover { this.isTourist || this.getColumns()
.children { },
display: flex; methods: {
...mapActions("info", [
"setColumnId"
]),
// 跳转
jump (item) {
const { index } = item
// 数据科研点击后打开新窗口去到数据平台
if (index === 'data') {
window.open(Setting.isDev
? `http://192.168.31.125:8092/#/`
: Setting.isTest
? location.origin
: `https://www.dataforward.cn`)
} else if (index === 'trial') {
// 申请试用
// window.open('https://www.wjx.cn/vm/wB0RcMm.aspx')
} else if (index === '/screen') {
// 数据看板
window.open(this.$router.resolve('/screen').href)
} else {
const token = util.local.get(Setting.tokenKey)
// 如果未登录且跳转的是登录后才有的菜单
if (!token && this.loginedMenu.find(e => e.index === index)) {
location.reload()
} else {
this.active = index
this.columnActive = ''
this.setColumnId('')
index === '/preInfo/list' || index === '/info/list' || this.$router.push(index).catch(err => { })
token !== this.token && location.reload() // 如果登录后再返回该页面，浏览器里会存有token，但是这个页面里的token是刚进到页面时获取的，应该是空，如果是这个情况，则刷新，否则右上角还会显示为登录按钮
}
} }
},
// 获取资讯一级栏目
getColumns () {
this.$get(this.api.queryAllColumns).then(({ columnTree }) => {
this.columns.push(...columnTree)
}).catch(res => { })
},
// 一级栏目点击回调
toInfo (e, column) {
e.stopPropagation()
const { id } = column
const path = this.isTourist ? 'preInfo' : 'info'
this.active = `/${path}/list`
this.columnActive = id
this.$router.push(`/${path}/list?parentId=${id || ''}&name=${column.name}`)
} }
} }
.children { };
</script>
<style lang="scss" scoped>
.nav {
position: absolute; position: absolute;
top: 64px; top: 0;
left: 50%; left: 50%;
display: none; display: flex;
background-color: #fff;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.15);
transform: translateX(-50%); transform: translateX(-50%);
&.show {
display: flex;
}
& > li { & > li {
padding: 0 20px; position: relative;
margin: 0 20px; padding: 0 15px;
color: #333; margin: 0 20px;
line-height: 64px; font-size: 16px;
cursor: pointer; line-height: 60px;
&:before { color: #3f3f3f;
content: ''; white-space: nowrap;
display: inline-block; cursor: pointer;
width: 3px; border-bottom: 4px solid transparent;
height: 3px; &.active {
margin-right: 10px; color: $main-color;
vertical-align: middle; border-bottom-color: $main-color;
background-color: #333; }
} &:hover {
&.active { .children {
color: $main-color; display: flex;
&:before { }
background-color: $main-color; }
}
.children {
position: absolute;
top: 64px;
left: 50%;
display: none;
background-color: #fff;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.15);
transform: translateX(-50%);
&.show {
display: flex;
}
& > li {
padding: 0 20px;
margin: 0 20px;
color: #333;
line-height: 64px;
cursor: pointer;
&:before {
content: '';
display: inline-block;
width: 3px;
height: 3px;
margin-right: 10px;
vertical-align: middle;
background-color: #333;
}
&.active {
color: $main-color;
&:before {
background-color: $main-color;
}
}
} }
}
} }
}
} }
@media (max-width: 1680px) { @media (max-width: 1870px) {
.nav { .nav {
left: 55%; left: 55%;
& > li { & > li {
margin: 0 10px; margin: 0 10px;
} }
} }
} }
@ -265,7 +272,7 @@ export default {
.nav { .nav {
left: 58%; left: 58%;
& > li { & > li {
padding: 0 10px; padding: 0 10px;
} }
} }
} }

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

@ -1,90 +1,120 @@
<template> <template>
<div> <div>
<el-table <el-table ref="table"
ref="table" class="table"
class="table" :data="listData"
:data="listData" stripe>
stripe <el-table-column prop="id"
> label="次序"
<el-table-column prop="id" label="次序" width="60" align="center" type="index"></el-table-column> width="60"
<el-table-column prop="curriculumName" label="课程名称" align="center"></el-table-column> align="center"
<el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column> type="index"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column> <el-table-column prop="curriculumName"
<el-table-column prop="score" width="60" label="得分" align="center"></el-table-column> label="课程名称"
<el-table-column prop="className" width="100" label="实验班级" align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="timeSum" width="80" label="耗时" align="center"> <el-table-column prop="experimentalName"
<template slot-scope="scope"> label="考核名称"
{{ scope.row.timeSum }}min align="center"></el-table-column>
</template> <el-table-column prop="projectName"
</el-table-column> label="实验项目名称"
<el-table-column prop="startTime" width="160" label="起始时间" align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="submitTime" width="160" label="结束时间" align="center"></el-table-column> <el-table-column prop="score"
<el-table-column label="操作" width="100" align="center"> width="60"
<template slot-scope="scope"> label="得分"
<el-button type="text" @click="toReport(scope.row)">实验成绩报告</el-button> align="center"></el-table-column>
</template> <el-table-column prop="className"
</el-table-column> width="100"
</el-table> label="实验班级"
<div class="pagination"> align="center"></el-table-column>
<el-pagination background :current-page="page" layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange"></el-pagination> <el-table-column prop="timeSum"
</div> 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">
<template slot-scope="scope">
<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>
</div> </div>
</div>
</template> </template>
<script> <script>
import { mapActions } from "vuex"; import { mapActions } from "vuex";
export default { export default {
props: ["curriculumId"], props: ['mallId', 'curriculumId'],
data() { data () {
return { return {
listData: [], listData: [],
page: 1, page: 1,
pageSize: 10, pageSize: 10,
total: 0 total: 0
}; };
},
watch: {
mallId: function (val) {
this.initData();
}, },
watch: { },
curriculumId: function(val) { mounted () {
this.initData(); this.page = 1
} this.getData()
},
methods: {
...mapActions({
setCurriculum: "project/setCurriculum"
}),
tableRowStyle ({ row, column, rowIndex, columnIndex }) {
if (rowIndex % 2 === 0) {
return "background-color: #FFF";
} else {
return "background-color: #F5F2FF";
}
}, },
mounted() { handleCurrentChange (val) {
this.page = 1 this.page = val;
this.getData() this.getData();
}, },
methods: { getData () {
...mapActions({ this.$post(this.api.queryAssessmentByStudent, {
setCurriculum: "project/setCurriculum" pageNum: this.page,
}), pageSize: this.pageSize,
tableRowStyle({ row, column, rowIndex, columnIndex }) { mallId: this.mallId,
if (rowIndex % 2 === 0) { curriculumId: this.curriculumId
return "background-color: #FFF"; }).then(res => {
} else { this.listData = res.page.records;
return "background-color: #F5F2FF"; this.total = res.page.total;
} }).catch(err => { });
}, },
handleCurrentChange(val) { toReport (row) {
this.page = val; this.setCurriculum(this.curriculumId)
this.getData(); this.$router.push(`show?reportId=${row.reportId}`);
},
getData() {
this.$post(this.api.queryAssessmentByStudent, {
pageNum: this.page,
pageSize: this.pageSize,
curriculumId: this.curriculumId
}).then(res => {
this.listData = res.page.records;
this.total = res.page.total;
}).catch(err => {});
},
toReport(row) {
this.setCurriculum(this.curriculumId)
this.$router.push(`show?reportId=${row.reportId}`);
}
} }
}
}; };
</script> </script>
<style lang="scss" scopted> <style lang="scss" scopted>
</style> </style>

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

@ -1,64 +1,80 @@
<template> <template>
<!-- 实验记录 --> <!-- 实验记录 -->
<div class="wrap"> <div class="wrap">
<div class="block overview"> <div class="block overview">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/record5.png" alt=""> <img src="@/assets/img/record5.png"
实验概览 alt="">
</h6> 实验概览
<div class="nums"> </h6>
<div class="item"> <div class="nums">
<p class="val">{{ overview.userName }}</p> <div class="item">
<p class="name">姓名</p> <p class="val">{{ overview.userName }}</p>
</div> <p class="name">姓名</p>
</div>
<div class="item"> <div class="item">
<p class="val">{{ overview.experimentalNum }}</p> <p class="val">{{ overview.experimentalNum }}</p>
<p class="name">实验次数(次)</p> <p class="name">实验次数(次)</p>
</div> </div>
<div class="item"> <div class="item">
<p class="val">{{ overview.duration ? overview.duration : 0 }}小时</p> <p class="val">{{ overview.duration ? overview.duration : 0 }}小时</p>
<p class="name">实验总时长(时)</p> <p class="name">实验总时长(时)</p>
</div> </div>
<div class="item"> <div class="item">
<p class="val">{{ overview.avgScore ? overview.avgScore.toFixed(2) : overview.avgScore }}</p> <p class="val">{{ overview.avgScore ? overview.avgScore.toFixed(2) : overview.avgScore }}</p>
<p class="name">实验平均分</p> <p class="name">实验平均分</p>
</div>
</div>
</div> </div>
</div>
</div>
<div class="block record"> <div class="block record">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/record6.png" alt=""> <img src="@/assets/img/record6.png"
实验记录明细 alt="">
</h6> 实验记录明细
</h6>
<div class="tool"> <div class="tool">
<ul class="filter" style="justify-content: space-between;"> <ul class="filter"
<div class="tabs"> style="justify-content: space-between;">
<a class="item" v-for="(item,index) in tabList" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a> <div class="tabs">
</div> <a class="item"
<li style="margin-right: 0"> v-for="(item, i) in tabs"
<label>课程选择：</label> :key="i"
<el-select v-model="curriculumId"> :class="{active: item.id == active}"
<el-option @click="tabChange(item.id)">{{ item.name }}</a>
v-for="item in curriculumList" </div>
:key="item.cid" <li style="margin-right: 0">
:label="item.curriculumName" <label>课程选择：</label>
:value="item.cid" <el-cascader v-model="mallIds"
></el-option> :options="curs"
</el-select> :props="{ checkStrictly: true, value: 'id' }"
<el-button style="margin-left: 20px;" type="primary" @click="exportData">导出数据</el-button> popper-class="course-cas"
</li> @expand-change="curChange"
</ul> @change="curChange"></el-cascader>
</div>
<practice v-if="active == 'practice'" :curriculumId.sync="curriculumId" :key="curriculumId"></practice> <el-button style="margin-left: 20px;"
<ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass> type="primary"
</div> @click="exportData">导出数据</el-button>
</li>
</ul>
</div>
<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>
</div>
</template> </template>
<script> <script>
@ -69,88 +85,119 @@ import axios from 'axios';
import Setting from "@/setting"; import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
export default { export default {
components: { components: {
practice, practice,
ass ass
}, },
data() { data () {
return { return {
curriculumId: "", mallIds: [],
curriculumList: [ curs: [],
{ mallId: '',
cid: '', curriculumId: "",
curriculumName: '不限' curriculumList: [
} {
], cid: '',
overview: {}, curriculumName: '不限'
active: "practice", }
tabList: { ],
practice: "练习", overview: {},
ass: "考核" active: 0,
}, tabs: [
token:util.local.get(Setting.tokenKey), {
}; id: 0,
}, name: '练习'
computed: { },
...mapState("project", [ {
'lastRecordType', 'currId' id: 1,
]) name: '考核'
},
],
token: util.local.get(Setting.tokenKey),
};
},
computed: {
...mapState("project", [
'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 : 0;
},
mounted () {
this.getData()
this.getCourse()
},
methods: {
...mapActions({
setRecord: "project/setRecord"
}),
// 获取课程
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
}
}, },
created() { // 课程选择回调
this.active = this.lastRecordType ? this.lastRecordType : "practice"; 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
}, },
mounted() {
this.getData(); getData () { // 获取实验概览数据
this.getschoolCourse(); this.$get(this.api.experimentOverview).then(res => {
this.overview = res.data;
}).catch(err => { })
}, },
methods: { exportData () { // 导出
...mapActions({ if (this.active == "practice") {
setRecord: "project/setRecord" // 练习
}), axios.get(`${this.api.exportPracticeByStudent}?curriculumId=${this.curriculumId}`, {
getschoolCourse() { // 获取课程下拉框数据 headers: {
this.$get(this.api.schoolCourseByAchievement).then(res => { token: this.token
if (res.data && res.data.length) { },
this.curriculumList = [...this.curriculumList, ...res.data] responseType: 'blob'
this.curriculumId = this.currId || this.curriculumList[0].cid }).then((res) => {
} util.downloadFileDirect(`学生练习成绩.xls`, new Blob([res.data]))
}).catch(err => { }).catch(res => { })
console.log(err); } else {
}); // 考核
}, axios.get(`${this.api.exportAssessmentByStudent}?curriculumId=${this.curriculumId}`, {
getData() { // 获取实验概览数据 headers: {
this.$get(this.api.experimentOverview).then(res => { token: this.token
this.overview = res.data; },
}).catch(err => {}) responseType: 'blob'
}, }).then((res) => {
exportData() { // 导出 util.downloadFileDirect(`学生考核成绩.xls`, new Blob([res.data]))
if (this.active == "practice") { }).catch(res => { })
// 练习 }
axios.get(`${this.api.exportPracticeByStudent}?curriculumId=${this.curriculumId}`,{
headers: {
token: this.token
},
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
}).catch(res => {})
} else {
// 考核
axios.get(`${this.api.exportAssessmentByStudent}?curriculumId=${this.curriculumId}`,{
headers: {
token: this.token
},
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
}).catch(res => {})
}
},
tabChange(index) {
this.active = index;
this.setRecord(index)
// this.$store.dispatch('project/setRecord', index)
}
}, },
tabChange (id) {
this.active = id
this.setRecord(id)
}
},
}; };
</script> </script>
@ -169,21 +216,21 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.item:nth-child(1) { .item:nth-child(1) {
background: url(../../../assets/img/record1-1.png) (88% 25px)/auto no-repeat, background: url(../../../assets/img/record1-1.png) (88% 25px) / auto no-repeat,
url(../../../assets/img/record1.png) 0 0/100% 100% no-repeat; url(../../../assets/img/record1.png) 0 0/100% 100% no-repeat;
} }
.item:nth-child(2) { .item:nth-child(2) {
background: url(../../../assets/img/record2-1.png) (88% 15px)/auto no-repeat, background: url(../../../assets/img/record2-1.png) (88% 15px) / auto no-repeat,
url(../../../assets/img/record2.png) 0 0/100% 100% no-repeat; url(../../../assets/img/record2.png) 0 0/100% 100% no-repeat;
} }
.item:nth-child(3) { .item:nth-child(3) {
background: url(../../../assets/img/record3-1.png) (88% 20px)/auto no-repeat, background: url(../../../assets/img/record3-1.png) (88% 20px) / auto no-repeat,
url(../../../assets/img/record3.png) 0 0/100% 100% no-repeat; url(../../../assets/img/record3.png) 0 0/100% 100% no-repeat;
} }
.item:nth-child(4) { .item:nth-child(4) {
margin-right: 0; margin-right: 0;
background: url(../../../assets/img/record4-1.png) (88% 18px)/auto no-repeat, background: url(../../../assets/img/record4-1.png) (88% 18px) / auto no-repeat,
url(../../../assets/img/record4.png) 0 0/100% 100% no-repeat; url(../../../assets/img/record4.png) 0 0/100% 100% no-repeat;
} }
.item { .item {
width: 22%; width: 22%;
@ -219,7 +266,7 @@ export default {
line-height: 34px; line-height: 34px;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
border: 1px solid #CACFDB; border: 1px solid #cacfdb;
cursor: pointer; cursor: pointer;
&.active { &.active {
color: #fff; color: #fff;

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

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

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

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

1971
src/pages/screen/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -594,7 +594,7 @@ export default {
}, },
// 获取学习进度 // 获取学习进度
async getProgress () { 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 this.progressList = res.list
if (res.list.length) this.archProject = res.list[0].projectId if (res.list.length) this.archProject = res.list[0].projectId
this.maximumScores.length || this.getMaximumScore() this.maximumScores.length || this.getMaximumScore()
@ -906,6 +906,7 @@ export default {
this.$get(this.api.getProjectBySystemId, { this.$get(this.api.getProjectBySystemId, {
systemId: this.systemIds, systemId: this.systemIds,
cId: this.courseId, // 课程id cId: this.courseId, // 课程id
mallId: this.mallId,
permissions: 0 // 0: 练习,1: 考核 permissions: 0 // 0: 练习,1: 考核
}).then(({ projects }) => { }).then(({ projects }) => {
this.loading = false 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` 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) { } 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) { } 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`); 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) { } else if (systemId == 22) {

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

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

Write Preview
Loading…
Cancel
Save