Branch_d40a2540
yujialong 1 year ago
parent 2ab291e7bd
commit c93be55486
  1. 35
      src/pages/achievement/info/course.vue
  2. 27
      src/pages/achievement/info/project.vue
  3. 3
      src/pages/achievement/list/index.vue
  4. 2
      src/pages/achievement/list/project.vue
  5. 2
      src/pages/assessment/list/index.vue
  6. 18
      src/pages/product/list/index.vue
  7. 2
      src/setting.js

@ -3,7 +3,7 @@
<el-card shadow="hover"
class="m-b-20 head-card">
<div class="flex-between m-b-20">
<el-page-header @back="$router.back()"
<el-page-header @back="$router.push('list?tab=tab1')"
:content="goodsName"></el-page-header>
</div>
@ -114,7 +114,7 @@
<el-table-column label="累计练习时长"
align="center">
<template slot-scope="scope">
{{ scope.row.timeSum }}min
{{ scope.row.cumulativePracticeTime }}min
</template>
</el-table-column>
</template>
@ -520,18 +520,17 @@ export default {
this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.goodsName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}`)
},
getChart () { // 线
const xData = Array.from({ length: 101 }, (v, k) => k)
const yData = Array.from({ length: 101 }, (v, k) => 0)
const data = {}
const list = this.listDataAll
const prop = this.curTab == 0 ? 'avgScore' : 'averageScore'
list.map(n => {
yData[n[prop]]++
})
return console.log(333, xData, yData)
const nums = this.stageNumber
for (const i in this.stageNumber) {
data.push(nums[i])
if (!data[n[prop]]) {
data[n[prop]] = 1
} else {
data[n[prop]]++
}
})
console.log(333, data, Object.keys(data), Object.values(data))
let myChart = echarts.init(document.getElementById("chart"));
myChart.setOption({
title: { text: "实验分数分布图" },
@ -540,16 +539,22 @@ export default {
name: "分数",
type: "category",
boundaryGap: false,
interval: 10,
data: ["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", '100']
interval: 5,
axisLabel: {
interval: 9,
},
data: Object.keys(data)
},
yAxis: {
name: this.permissions ? "人数" : '成绩报告数量',
name: this.curTab == 1 ? "人数" : '成绩报告数量',
type: "value",
interval: 1
interval: 10,
axisLabel: {
interval: 9,
},
},
series: [{
data,
data: Object.values(data),
type: "line",
areaStyle: {},
color: ["#8191fd"]

@ -1,11 +1,14 @@
<template>
<div>
<div class="back-wrap">
<span class="back"
@click="$router.back()">返回 ></span>
<span class="name">{{ experimentalName }}</span>
</div>
<el-card shadow="hover"
class="m-b-20 head-card">
<div class="flex-between m-b-20">
<el-page-header @back="$router.back()"
:content="experimentalName"></el-page-header>
<div>
<span class="m-r-10">班级</span>
<el-select v-model="classId"
@ -22,7 +25,6 @@
</el-select>
</div>
</div>
</el-card>
<el-card shadow="hover"
@ -82,7 +84,7 @@
</div>
<div class="flex-between m-b-20">
<div>
<el-input placeholder="请输入班级/姓名/学号"
<el-input placeholder="请输入姓名/学号"
prefix-icon="el-icon-search"
v-model="keyword"
clearable></el-input>
@ -269,6 +271,7 @@ import Setting from "@/setting";
import util from "@/libs/util";
import echarts from "echarts";
import axios from 'axios';
import breadcrumb from '@/components/breadcrumb'
export default {
data () {
return {
@ -308,6 +311,9 @@ export default {
totalActivation: 0,
};
},
components: {
breadcrumb
},
watch: {
keyword: function (val) {
clearTimeout(this.searchTimer);
@ -332,9 +338,10 @@ export default {
methods: {
//
async getClass () {
const { list } = this.permissions ?
let { list } = this.permissions ?
await this.$post(`${this.api.spliceClass}?assessmentId=${this.id}`) :
await this.$post(this.api.myClass)
if (!this.permissions) list = list.slice(1)
this.classes = list
},
//
@ -633,6 +640,14 @@ export default {
</script>
<style lang="scss" scoped>
.back-wrap {
margin-bottom: 20px;
.back {
margin-right: 20px;
color: #9278ff;
cursor: pointer;
}
}
/deep/ .head-card {
.el-card__body {
padding-bottom: 0px;

@ -28,7 +28,7 @@ export default {
},
data () {
return {
active: this.$route.query.tab || "tab1", //
active: this.$route.query.tab || "tab2", //
tabs: {
tab1: '课程维度',
tab2: '项目维度',
@ -42,6 +42,7 @@ export default {
])
},
mounted () {
this.$store.commit('achievement/setRow', null)
// Setting.dynamicRoute && this.initTabs();
},
methods: {

@ -95,7 +95,7 @@
</el-table-column>
<template v-if="projectPermissions == 1">
<el-table-column prop="className"
label="班级"
label="实验班级"
align="center"
min-width="140"></el-table-column>
<el-table-column prop="experimentalName"

@ -456,7 +456,7 @@ export default {
this.$router.push(`add?id=${row.id}`);
},
show (row) {
this.$router.push(`/achievement/teach?id=${row.id}&projectName=${row.projectName}&permissions=1`)
this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1`)
},
start (row) {
this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => {

@ -575,11 +575,11 @@ export default {
color: #fff;
}
h6 {
margin-bottom: 15px;
font-size: 50px;
margin-bottom: 25px;
font-size: 44px;
}
.sub {
font-size: 24px;
font-size: 22px;
}
}
.inner-wrap {
@ -843,4 +843,16 @@ export default {
}
}
}
@media (max-width: 1500px) {
.wrap {
.banner-item {
h6 {
font-size: 35px;
}
.sub {
font-size: 18px;
}
}
}
}
</style>

@ -26,7 +26,7 @@ if (isPro) {
uploadURL = `http://121.37.12.51/`
host = "http://121.37.12.51/"; // 中台测试服
// host = 'https://www.occupationlab.com/' // 正式服
// host = "http://192.168.31.217:9000/"; // 榕
host = "http://192.168.31.217:9000/"; // 榕
// host = 'http://192.168.31.51:9000/'; // 赓
}

Loading…
Cancel
Save