@@ -221,10 +221,9 @@ export default {
setup(props, ctx) {
const store = useStore();
const state = reactive({
- template:
- process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
+ template: process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_STUDENT_TEMPLATE,
importStudent:
- process.env.VUE_APP_BASE_API + "admin/student/importStudent",
+ process.env.VUE_APP_BASE_API + "/admin/student/importStudent",
timers: "", // 定时器，用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1,
@@ -235,11 +234,6 @@ export default {
errNum: 0, //失败数据数
downloadErrUrl: "",
showBottomBar: false, // 显示底部成功条数和失败条数
- locationHref:
- location.href.indexOf("http://") !== -1
- ? "http://111.231.196.214:12016/"
- : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
-
userId: store.state.userInfo.id,
userName: store.state.userInfo.realName,
fileName: "",
@@ -337,9 +331,8 @@ export default {
// 下载失败数据
const downloadEeeorData = () => {
- console.log(state.locationHref + state.downloadErrUrl);
if (state.downloadErrUrl !== "") {
- window.open(state.locationHref + state.downloadErrUrl);
+ window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
}
};
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 858a374f..4ee59150 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -20,7 +20,7 @@
- 请下载
- 模板
+ 模板
，按要求填写数据并导入
@@ -352,15 +352,19 @@ export default {
const downloadEeeorData = () => {
console.log(state.locationHref + state.downloadErrUrl);
if (state.downloadErrUrl !== "") {
- window.open(state.locationHref + state.downloadErrUrl);
+ window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
}
};
+ function downTemplate(){
+ window.open(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE)
+ }
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
handleChange,
+ downTemplate,
BATCH_IMPORT_SCORE,
beforeUpload,
handleUpload,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index a2d9fdfc..169389ea 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -682,19 +682,12 @@ const exportHomeWorkShow = () => {
api
.exportHomeWork(obj)
.then((res) => {
- console.log("导出作业", JSON.parse(res.data).data);
- if (JSON.parse(res.data).code === 200) {
- message.destroy();
- message.success("导出作业成功");
- exportHomeWorkV.value = true;
- downloadUrl.value = JSON.parse(res.data).data;
- }
- })
- .catch((err) => {
+ console.log("导出作业", res.data.data);
message.destroy();
- message.error("导出作业失败");
- console.log("导出作业失败", err);
- });
+ message.success("导出作业成功");
+ exportHomeWorkV.value = true;
+ downloadUrl.value = res.data.data;
+ })
};
// //导出作业
// const exportHomeWork = () => {
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index 8b559f8c..b242b371 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -80,12 +80,12 @@
{{values.createTime?values.createTime:'-'}} {{values.createName?values.createName:'-'}}
- 来源：{{values.source?values.source:'-'}}
+ 来源：{{{1:'项目',2:'路径图',3:'开课'}[values.type]+'-'+values.name}}