Skip to content

Q
qualityTesting_adminHome
提交 dec782ac authored 作者: wangjialong209's avatar wangjialong209
浏览文件
操作

功能完善

上级 1b2e5eb5
隐藏空白字符变更
内嵌 并排
正在显示 包含 332 行增加 和 50 行删除
src/components/AnalyseModule/components/BarChart.vue
浏览文件 @ dec782ac
......@@ -35,6 +35,7 @@ export default {
});
let option;
option = {
color: ['#cd9f50', '#47afa0', '#bcdfdc'],
tooltip: {
trigger: 'axis',
axisPointer: {
......@@ -43,7 +44,13 @@ export default {
},
legend: {
// data: ['Forest', 'Steppe', 'Desert', 'Wetland']
data: legend_data
// data: legend_data,
formatter: (name) => {
let objs = this.chart_data.labers.filter(itme => {
return itme.key == name;
})
return objs[0].label
}
},
toolbox: {
show: false,
......
src/components/AnalyseModule/components/table.vue
浏览文件 @ dec782ac
......@@ -27,7 +27,14 @@
{{ key }}({{ item['distribute'][key] }}人)
</div>
</div>
</div>
<div v-else-if="Array.isArray(item[e.key])">
<el-popover placement="right" width="200" trigger="click" v-if="item[e.key].length > 0">
<div v-for="(h, j) in item[e.key]" :key="j">
{{ h }}
</div>
<el-button slot="reference" type="text" size="mini">...</el-button>
</el-popover>
</div>
<div v-else>{{ item[e.key] }}</div>
</td>
......
src/components/ExaminationHeader/index.vue
浏览文件 @ dec782ac
......@@ -18,6 +18,10 @@
<div class="person_attribute_box" v-for="(item, index) in data_keys" :key="index"
v-show="info_data[item.key] != undefined">
<span v-if="item.key == 'duration'">
<span class="label">{{ item.label }}</span>
<span>{{ info_data[item.key] }}分钟</span>
</span>
<span v-else-if="item.key == 'answer_duration'">
<span class="label">{{ item.label }}</span>
<span class="label">{{ seconds_to_minutes(info_data[item.key]) }}</span>
</span>
......@@ -43,6 +47,7 @@ export default {
{ label: '用户名', key: 'user_name' },
{ label: '成绩', key: 'score' },
{ label: '考试时长', key: 'duration' },
{ label: '考试时长', key: 'answer_duration' },
],
strong_keys: ['user_name', 'score'],
......
src/components/TableHead/index.vue
浏览文件 @ dec782ac
......@@ -9,11 +9,15 @@
<div>
<el-row :gutter="20">
<el-col :span="9">
<span>搜索：</span>
<el-input placeholder="输入名称" class="search_box" v-model="search_val"
:placeholder="!head_data.search_placeholder ? '搜索' : head_data.search_placeholder" @change="searchChange"></el-input>
<el-button type="warning" size="small" @click="search">搜索</el-button>
<el-button size="small" @click="resetting">重置</el-button>
<div v-if="head_data.is_search_show">
<span>搜索：</span>
<el-input placeholder="输入名称" class="search_box" v-model="search_val"
:placeholder="!head_data.search_placeholder ? '搜索' : head_data.search_placeholder"
@change="searchChange"></el-input>
<el-button type="warning" size="small" @click="search">搜索</el-button>
<el-button size="small" @click="resetting">重置</el-button>
</div>
<div v-else style="opacity: 0;pointer-events: none;">暂无</div>
</el-col>
<el-col :span="15" style="text-align: right;">
<span v-for="(item, index) in head_data.right_buttons" :key="index" style="margin: 0 8px;">
......@@ -51,7 +55,7 @@ export default {
search() {
this.$emit('search', this.search_val);
},
searchChange(){
searchChange() {
this.$emit('change', this.search_val);
},
resetting() {
......
src/copy.vue
浏览文件 @ dec782ac
......@@ -75,6 +75,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/business/display_board/index.vue
浏览文件 @ dec782ac
......@@ -60,6 +60,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/student/area_breed/index.vue
浏览文件 @ dec782ac
......@@ -107,6 +107,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/student/display_board/detail.vue
浏览文件 @ dec782ac
......@@ -148,6 +148,7 @@ export default {
is_loading: false,
//头部数据
head_data: {
is_search_show: true,
title: '测试体贴',
right_buttons: [
// {
......
src/views/student/display_board/index.vue
浏览文件 @ dec782ac
......@@ -7,10 +7,28 @@
<div class="table_container">
<el-table v-loading="is_loading" :data="tableData" style="width: 100%;margin-bottom: 20px;" height="650">
<el-table-column prop="id" label="编号" width="50"></el-table-column>
<!-- <el-table-column prop="remarks" label="备注"></el-table-column> -->
<el-table-column prop="found_user.name" label="创建人" width="110"></el-table-column>
<el-table-column prop="found_user.name" label="题目名称" width="180">
<template slot-scope="scope">
<!-- <div v-if="(changeReviewContent(scope.row.review_content)).length > 1">
<el-popover placement="right" title="多个标题" width="200" trigger="hover">
<div>
<el-tag type="info" v-for="(item, index) in changeReviewContent(scope.row.review_content)"
:key="index" style="margin-bottom: 10px;">{{ item }}</el-tag>
</div>
<el-button slot="reference" type="text">...</el-button>
</el-popover>
</div>
<div v-else-if="(changeReviewContent(scope.row.review_content)).length == 1">{{
(changeReviewContent(scope.row.review_content))[0] }}</div>
<div v-else>暂无...</div> -->
<div v-for="(item, index) in scope.row.examination_questions" :key="index">
{{ item.title }}
</div>
</template>
</el-table-column>
<el-table-column prop="found_user.name" label="创建人" width="90"></el-table-column>
<el-table-column prop="found_remark" label="创建备注"></el-table-column>
<el-table-column prop="auditor_user.name" label="审核人"></el-table-column>
<el-table-column prop="auditor_user.name" label="审核人" width="90"></el-table-column>
<el-table-column prop="release_date" label="发布日期"></el-table-column>
<el-table-column prop="created_at" label="创建时间"></el-table-column>
<el-table-column prop="remarks" label="备注"></el-table-column>
......@@ -87,6 +105,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
search_placeholder: "",
right_buttons: [
// {
......@@ -225,7 +244,18 @@ export default {
path: '/student/display_board_detail',
query: { id: id }
})
}
},
//试题列表
changeReviewContent(data) {
let datas = JSON.parse(data);
console.log(datas);
if (datas.EyeStability) {
return datas.EyeStability.title || [];
} else {
return [];
}
},
},
}
......
src/views/student/examination_questions/comment/index.vue
浏览文件 @ dec782ac
......@@ -163,6 +163,7 @@ export default {
is_loading: false,
//头部数据
head_data: {
is_search_show: true,
title: null,
right_buttons: [
{
......
src/views/student/examination_questions/detail/index.vue
浏览文件 @ dec782ac
......@@ -9,6 +9,12 @@
<el-card class="box-card">
<table-head :head_data="head_data" @search="searchEvent" @resetting="resetting" @btnClick="btnClick"
@upload="uploadTestQuestions"></table-head>
<!-- <div>
<el-button v-for="(item, index) in head_data.right_buttons" :key="index" type="primary" :icon="item.icon"
@click="resetting(item.event)">
{{ item.text }}
</el-button>
</div> -->
<div class="table_container">
<el-table v-loading="is_loading" :data="table_list" style="width: 100%;margin-bottom: 20px;" height="500">
<el-table-column prop="id" label="编号" width="50">
......@@ -109,6 +115,7 @@ export default {
examination_questions_id: null,//试题id
//头部按钮
head_data: {
is_search_show: false,
search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/student/examination_questions/list/index.vue
浏览文件 @ dec782ac
......@@ -17,9 +17,9 @@
}}</el-button>
</template>
</el-table-column>
<el-table-column prop="remarks" label="开考备注">
<el-table-column prop="remarks" label="考试提示">
<template slot-scope="scope">
<div class="remark_box" :title="scope.row.remarks">{{ scope.row.remarks }}</div>
<div class="remark_box" :title="scope.row.opening_tip">{{ scope.row.opening_tip }}</div>
</template>
</el-table-column>
<el-table-column prop="begin_date" label="考试时间">
......@@ -213,6 +213,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/student/personnel/index.vue
浏览文件 @ dec782ac
......@@ -212,6 +212,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/student/test_results/detail/index.vue
浏览文件 @ dec782ac
......@@ -9,38 +9,44 @@
<el-card class="box-card" v-if="questions_list.length > 0">
<answer-card :questions_lists="questions_list" :test_results_lists="test_results_list"></answer-card>
</el-card>
<el-card class="box-card" v-if="false">
<div>
<div class="line_header">易错、对等级分析</div>
<el-row>
<el-col :span="12">
<div style="width: calc(100% - 20px);">
<analyse-module></analyse-module>
</div>
</el-col>
<el-col :span="12">
<analyse-module></analyse-module>
</el-col>
</el-row>
</div>
<div>
<div class="line_header">易错、对等级分析</div>
<el-row>
<el-col :span="8">
<div style="width: calc(100% - 20px);">
<analyse-module></analyse-module>
</div>
</el-col>
<el-col :span="16">
<analyse-module></analyse-module>
</el-col>
</el-row>
</div>
<div>
<div class="line_header">老师点评</div>
<el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="test_text" style="widows: 100%;">
</el-input>
</div>
<el-card class="box-card">
<el-row>
<el-col :span="8">
<div class="centenr_container">
<AnalyseModule :module_data="area_score_list" v-if="area_score_list">
</AnalyseModule>
</div>
</el-col>
<el-col :span="8">
<div class="centenr_container">
<AnalyseModule :module_data="wrong_group_list" v-if="wrong_group_list"></AnalyseModule>
</div>
</el-col>
<el-col :span="8">
<div class="centenr_container">
<AnalyseModule :module_data="wrong_color_list" v-if="wrong_color_list">
</AnalyseModule>
</div>
</el-col>
<el-col :span="8" style="margin-top: 15px;">
<div class="centenr_container">
<AnalyseModule :module_data="error_level_list" v-if="error_level_list">
</AnalyseModule>
</div>
</el-col>
<el-col :span="8" style="margin-top: 15px;">
<div class="centenr_container">
<AnalyseModule :module_data="wrong_group_list" v-if="wrong_group_list">
</AnalyseModule>
</div>
</el-col>
<el-col :span="8" style="margin-top: 15px;">
<div class="centenr_container">
<AnalyseModule :module_data="eye_stability_list" v-if="eye_stability_list">
</AnalyseModule>
</div>
</el-col>
</el-row>
</el-card>
</div>
......@@ -60,7 +66,9 @@
<script>
import ExaminationHeader from '@/components/ExaminationHeader/index';
import AnswerCard from '../components/AnswerCard.vue';
import AnalyseModule from '../components/AnalyseModule.vue';
// import AnalyseModule from '../components/AnalyseModule.vue';
import AnalyseModule from '@/components/AnalyseModule/index.vue';
import { get_test_results_detail } from '@/api/student';
import { array_conversion } from '@/utils/tool';
const standard_template = {
......@@ -104,7 +112,22 @@ export default {
questions_list: [],//试题列表
test_results_list: [],//答题列表
test_text: '针对你在本次烟草知识考试中的表现，我认为你已经做得非常出色。你的答案准确地回答了考试中的问题，而且展现出了对烟草知识的全面了解。'
test_text: '针对你在本次烟草知识考试中的表现，我认为你已经做得非常出色。你的答案准确地回答了考试中的问题，而且展现出了对烟草知识的全面了解。',
//图出区域数据
area_score_list: null,
//错误部位
wrong_group_list: null,
//错误颜色
wrong_color_list: null,
//错误等级
error_level_list: null,
//错误组别
wrong_group_list: null,
///眼光稳定性
eye_stability_list: null,
};
},
......@@ -128,11 +151,12 @@ export default {
get_test_results_detail(this.test_results_id).then(res => {
console.log('考试结果详情');
console.log(res);
//头部组件
this.student_brief_introduction = {
title: res.examination_questions_title || '',
user_name: res.name || '',
score: res.score || '',
duration: res.answer_duration || '',
answer_duration: res.answer_duration || '',
status: res.status,
examination_status: [
{ id: 1, label: '预约完成', type: 'success' },
......@@ -149,10 +173,188 @@ export default {
});
let new_arr = array_conversion(res.examination_questions.examination_question_detail, 5);
this.test_results_list = res.test_results;
//表格列表
this.questions_list = new_arr;
//烟草区域
this.area_score_list = this.changeAreaScore(res.statistical_results.AreaScore);
//错误部位
this.wrong_group_list = this.changeWrongPosition(res.statistical_results.WrongPosition);
//错误颜色
this.wrong_color_list = this.changeWrongColor(res.statistical_results.WrongColor);
//错误等级
this.error_level_list = this.changeErrorLevel(res.statistical_results.ErrorLevel);
//错误组别
this.wrong_group_list = this.changeWrongGroup(res.statistical_results.WrongGroup);
//changeEyeStability
this.eye_stability_list = this.changeEyeStability(res.statistical_results.EyeStability)
console.log('处理好的数据');
console.log(this.eye_stability_list);
})
},
//区域得分
changeAreaScore(datas) {
if (!datas) return false;
let keys = Object.keys(datas);
let labers = [
{ label: '总分', key: 'assemble' },
{ label: '正确题目数量', key: 'subject_num_answer' },
{ label: '错误题目数量', key: 'subject_num_error' },
];
return {
type: "bar",
chart_id: 'bar_chart1',
color: '#E6A23C',
title: '突出区域的烟草识别',
labers,
keys,
raw_data: datas,
};
},
//错误部位
changeWrongPosition(datas) {
if (!datas) return false;
let keys = Object.keys(datas);
let list = [];
let labers = [
{ label: '部位', key: 'position' },
{ label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' },
];
keys.forEach((element, index) => {
list.push({
position: element,
answer: datas[element].answer,
wrong_num: datas[element].wrong_num,
distribute: datas[element].distribute,
});
});
return {
type: 'table',
chart_id: 'wrong_position',
color: '#E6A23C',
title: '错误部位',
labers,
list,
};
},
//错误颜色
changeWrongColor(datas) {
if (!datas) return false;
let keys = Object.keys(datas);
let list = [];
let labers = [
{ label: '颜色', key: 'color' },
{ label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' },
];
keys.forEach((element, index) => {
list.push({
color: element,
answer: datas[element].answer,
wrong_num: datas[element].wrong_num,
distribute: datas[element].distribute,
});
});
return {
type: 'table',
chart_id: 'wrong_color',
color: '#99A9BF',
title: '错误颜色',
labers,
list,
};
},
//错误等级
changeErrorLevel(datas) {
if (!datas) return false;
let keys = Object.keys(datas);
let list = [];
let labers = [
{ label: '等级', key: 'level' },
{ label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' },
];
keys.forEach((element, index) => {
list.push({
level: element,
answer: datas[element].answer,
wrong_num: datas[element].wrong_num,
distribute: datas[element].distribute,
});
});
return {
type: 'table',
chart_id: 'wrong_position',
color: '#505F79',
title: '错误等级',
labers,
list,
};
},
//错误组别
changeWrongGroup(datas) {
if (!datas) return false;
let keys = Object.keys(datas);
let list = [];
let labers = [
{ label: '组别', key: 'group' },
{ label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' },
];
keys.forEach((element, index) => {
list.push({
group: element,
answer: datas[element].answer,
wrong_num: datas[element].wrong_num,
distribute: datas[element].distribute,
});
});
return {
type: 'table',
chart_id: 'wrong_group',
color: '#529B2E',
title: '错误组别',
labers,
list,
};
},
//眼光稳定性
changeEyeStability(datas) {
if (!datas) return false;
let list = [];
let labers = [
{ label: '题目', key: 'title' },
{ label: '答案', key: 'answer' },
{ label: '正确数据', key: 'exactness' },
{ label: '错题数据', key: 'wrong' },
];
datas.data.forEach((element, index) => {
list.push({
title: datas.title[index],
answer: element.answer,
exactness: element.exactness,
wrong: element.wrong,
});
});
return {
type: 'table',
chart_id: 'wrong_group',
color: '#529B2E',
title: '眼光稳定性',
labers,
list,
};
},
},
}
......@@ -171,4 +373,9 @@ export default {
.line_header {
padding: 15px 0;
}
.centenr_container {
width: calc(100% - 20px);
margin: 0 auto;
}
</style>
src/views/student/test_results/list/index.vue
浏览文件 @ dec782ac
......@@ -41,7 +41,8 @@
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status == 1" type="success">预约完成</el-tag>
<el-tag v-if="scope.row.status == 2" type="success">考试完成</el-tag>
<el-tag v-if="scope.row.status == 2" type="success"
style="background-color: #b4d7c6;border-color: #71b7a0;color: #038D6E;">考试完成</el-tag>
<el-tag v-if="scope.row.status == 3" type="success">已发布</el-tag>
<el-tag v-if="scope.row.status == 4" type="info">取消</el-tag>
<el-tag v-if="scope.row.status == 6" type="danger">失效</el-tag>
......@@ -99,6 +100,7 @@ export default {
IP: process.env.VUE_APP_BASE_API,
//头部按钮
head_data: {
is_search_show: true,
search_placeholder: "学员姓名/手机号",
right_buttons: [
// {
......
src/views/student/tobacco_grades/index.vue
浏览文件 @ dec782ac
......@@ -111,6 +111,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/system/administrators/index.vue
浏览文件 @ dec782ac
......@@ -128,6 +128,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/system/department/index.vue
浏览文件 @ dec782ac
......@@ -123,6 +123,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/system/log/index.vue
浏览文件 @ dec782ac
......@@ -70,6 +70,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/system/menu/index.vue
浏览文件 @ dec782ac
......@@ -160,6 +160,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
src/views/system/roles/index.vue
浏览文件 @ dec782ac
......@@ -85,6 +85,7 @@ export default {
return {
//头部按钮
head_data: {
is_search_show: true,
// search_placeholder: "学员姓名/手机号",
right_buttons: [
{
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论