Skip to content

P
pica.cloud.web-education-admin
提交 629c5a5d 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

对接api

上级 4611c1ff
显示空白字符变更
内嵌 并排
正在显示 包含 88 行增加 和 32 行删除
src/utils/fetch.js
浏览文件 @ 629c5a5d
......@@ -54,8 +54,8 @@ service.interceptors.request.use(config => {
}
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
// config.headers['token'] = '16B877F215A84D528C285D4FA3081C37';
// config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
config.headers['token'] = '9E2D6A95B90043D9A2FC7A5DE4FE47F2';
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/operation.js
浏览文件 @ 629c5a5d
......@@ -312,6 +312,10 @@ export function getRegionOption() {
return option;
}
export function getLearnOrganization(data) {
if(data.length == 0) {
arr = [];
return arr;
}
let organization = [
{
label: "全部",
......
src/views/learning/course-training.vue
浏览文件 @ 629c5a5d
......@@ -5,7 +5,7 @@
<p class="course-p">地区：{{ region }}</p>
<p class="course-p">选择机构：{{ organization }}</p>
<el-form class="form-update" ref="serchForm" :model="formData" label-width="100px" style="width:40%;">
<el-form-item label="课程完成状态:">
<el-form-item v-if="tableType == 1" label="课程完成状态:">
<el-select
v-model="formData.status"
size="small"
......@@ -20,6 +20,21 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="tableType == 2" label="考试成绩等级:">
<el-select
v-model="formData.rank"
size="small"
style="width: 100%;"
placeholder="请选择状态"
>
<el-option
v-for="(item,index) in rankList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="查询姓名: ">
<el-input size="small" placeholder="查询姓名" v-model="formData.name">
</el-input>
......@@ -103,6 +118,7 @@ export default {
formData: {
name: '',
status: '',
rank: '',
pageNo: 1,
pageSize: 10,
},
......@@ -124,7 +140,13 @@ export default {
value: 3,
label: '已完成'
},
]
],
rankList: [
{
value: 1,
label: '不通过',
}
],
};
},
// computed: {
......
src/views/learning/item-course-analysis.vue
浏览文件 @ 629c5a5d
......@@ -17,7 +17,7 @@
</el-table-column>
<el-table-column prop="courseTotalTime" label="课程时长" align="center">
</el-table-column>
<el-table-column prop="personTime" label="人均学习时长" align="center">
<el-table-column prop="courseAvgStudyTime" label="人均学习时长" align="center">
</el-table-column>
<el-table-column prop="courseLearnerCount" label="参与培训人数" align="center">
</el-table-column>
......@@ -72,7 +72,21 @@ export default {
},
data() {
return {
cardData: [],
cardData: [
{
title: '项目所有课程数',
num: 0,
unit: '门课程',
},{
title: '项目所有课程总时长',
num: 0,
unit: '分钟',
},{
title: '项目人均学习时长',
num: 0,
unit: '分钟',
}
],
tableData: [],
totalRows: 0,
projectId: '',
......@@ -92,22 +106,27 @@ export default {
})
},
methods: {
getCardData(data) {
this.cardData = [
{
title: '项目所有课程数',
num: data.projectCourseTotalTime,
unit: '门课程',
},{
title: '项目所有课程总时长',
num: data.projectCourseCount,
unit: '分钟',
},{
title: '项目人均学习时长',
num: data.projectAvgStudyTime,
unit: '分钟',
}
];
setCardData(data) {
vm.totalRows = data.projectCourseCount;
vm.cardData[0].num = data.projectCourseCount;
vm.cardData[1].num = data.projectCourseTotalTime;
vm.cardData[2].num = data.projectAvgStudyTime;
// vm.cardData = [
// {
// title: '项目所有课程数',
// num: data.projectCourseCount,
// unit: '门课程',
// },{
// title: '项目所有课程总时长',
// num: data.projectCourseTotalTime,
// unit: '分钟',
// },{
// title: '项目人均学习时长',
// num: data.projectAvgStudyTime,
// unit: '分钟',
// }
// ];
},
search() {
......@@ -128,7 +147,7 @@ export default {
vm.GET("report/portalProjectCourse/getTotal", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.getCardData(res.data)
vm.setCardData(res.data)
}
});
let reqList = req;
......@@ -143,7 +162,8 @@ export default {
},
checkName(data) {
console.log('dialogData',this.dialogData);
this.$router.push("course-training?tableType=1&courseId="+data.courseId+"&region="+this.dialogData.region+"&organization="+this.dialogData.organization);
// this.$router.push("course-training?tableType=1&courseId="+data.courseId+"&region="+this.dialogData.region+"&organization="+this.dialogData.organization);
this.$router.push({ path: '/course-training', query: this.dialogData});
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ 629c5a5d
......@@ -89,7 +89,7 @@ export default {
],
totalRows: 0, //数据总数
pageNo: 1, //当前是第几页
pageSize: 2, //页面总数
pageSize: 1, //页面总数
};
},
created() {
......@@ -105,6 +105,11 @@ export default {
})
},
methods: {
setCardData(data) {
vm.totalRows = data.projectExamCount;
vm.cardData[0].num = data.projectExamCount;
vm.cardData[1].num = data.projectExamQuestionCount;
},
// 搜索列表
search() {
if (vm.formInline.region.length == 0) {
......@@ -116,13 +121,14 @@ export default {
projectId: vm.projectId,
ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
type: operationData.getSearchType(vm.formInline),
OriginalFlag: vm.formInline.checked == false ? 0 : 1
originalFlag: vm.formInline.checked == false ? 0 : 1
};
console.log("4 req", req);
openLoading(vm);
vm.GET("report/portalProjectExam/getTotal", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.setCardData(res.data);
}
});
let reqList = req;
......@@ -131,7 +137,7 @@ export default {
vm.GET("report/portalProjectExam/getExamList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
// vm.tableData = res.data.list;
vm.tableData = res.data.list;
}
});
......
src/views/learning/item-list.vue
浏览文件 @ 629c5a5d
......@@ -88,7 +88,7 @@
</el-tab-pane>
<el-tab-pane label="考试分析" name="fourth">
<examination-analysisfrom
ref="examCourse"
ref="childExam"
:formInline="formInline"
:activeName="activeName"
:dialogData="dialogData"
......@@ -196,7 +196,9 @@ export default {
},
dialogData: {
region: "",
organization: ""
regionData: "",
organization: "",
organizationData: "",
},
tags: [],
activeName: "first",
......@@ -231,6 +233,7 @@ export default {
} else if (tab.name == "third") {
this.$refs.childCourse.$emit("search");
} else if (tab.name == "fourth") {
this.$refs.childExam.$emit("search");
}
},
handleChange(value) {
......@@ -239,6 +242,7 @@ export default {
setTimeout(function() {
// console.log(vm.$refs["cascaderRegion"].inputValue);
vm.dialogData.region = vm.$refs["cascaderRegion"].inputValue;
// console.log('vm.dialogData.region',vm.dialogData.region)
}, 20);
// console.log('region',value,vm.formInline);
......@@ -367,7 +371,7 @@ export default {
vm.GET("report/portal/getOrganizationList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
this.organizationList = operationData.getLearnOrganization(res.data);
this.organizationList = operationData.getLearnOrganization(res.data.hospitalList);
}
});
},
......@@ -398,7 +402,7 @@ export default {
} else if (this.activeName == "third") {
this.$refs.childCourse.$emit("search");
} else if (this.activeName == "fourth") {
} else if (this.activeName == "fifth") {
this.$refs.childExam.$emit("search");
}
},
//重置
......
src/views/learning/item-part-in.vue
浏览文件 @ 629c5a5d
......@@ -130,7 +130,7 @@ export default {
projectId: vm.projectId,
ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
type: operationData.getSearchType(vm.formInline),
OriginalFlag: vm.formInline.checked == false ? 0 : 1
originalFlag: vm.formInline.checked == false ? 0 : 1
};
console.log("1 req", req);
openLoading(vm);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或