diff --git a/.env b/.env index 846233c6..b8afca1f 100644 --- a/.env +++ b/.env @@ -2,8 +2,10 @@ VUE_APP_BASE=/manage # api项目基础url VUE_APP_BASE_API=/manageApi -# 导出url -VUE_APP_PROXY_URL=http://111.231.196.214:30001/ +#文件路径 +VUE_APP_FILE_PATH=/file/ +# 代理url 本地调试，不可以用在其他地方 +VUE_APP_PROXY_URL=http://111.231.196.214/manageApi # 登录url VUE_APP_LOGIN_URL=https://u-pre.boe.com/web # boe域名 @@ -18,5 +20,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loading # 课程二维码 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id= -# 导入学员模板 -VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ +# 导入学员模板 +VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩 模板-1673450632417.xlsx +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673452888323.xlsx diff --git a/.env.alpine b/.env.alpine new file mode 100644 index 00000000..07a433c1 --- /dev/null +++ b/.env.alpine @@ -0,0 +1,2 @@ +NODE_ENV=alpine +VUE_APP_OUTPUT_DIR=./docker/dist diff --git a/.env.test b/.env.test index 9df71ee6..310c858d 100644 --- a/.env.test +++ b/.env.test @@ -1,6 +1,2 @@ NODE_ENV=test -VUE_APP_BASE=/manage -VUE_APP_BASE_API=/manageApi -VUE_APP_OUTPUT_DIR=./docker/dist - VUE_APP_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/package.json b/package.json index 91c565dd..50050c3a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "build:boe": "vue-cli-service build --mode boe", "build:release": "vue-cli-service build --mode release", "build:prod": "vue-cli-service build --mode prod", - "build:test": "vue-cli-service build --mode test" + "build:test": "vue-cli-service build --mode test", + "build:alpine": "vue-cli-service build --mode alpine" }, "dependencies": { "@wangeditor/editor": "^5.1.23", diff --git a/src/App.vue b/src/App.vue index e84908a9..ad2ec813 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.0.4------------"); + console.log("版本2.0.5------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 8db32374..74e67963 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -6,7 +6,7 @@ * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import { message } from "ant-design-vue"; +import {message} from "ant-design-vue"; import axios from "axios"; import router from "@/router"; // import { getCookie } from '../api/method' @@ -21,7 +21,7 @@ const http = axios.create({ baseURL: process.env.VUE_APP_BASE_API, timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, - headers: { "Content-Type": "application/json" }, + headers: {"Content-Type": "application/json"}, }); http.interceptors.request.use( @@ -51,18 +51,19 @@ http.interceptors.response.use( (response) => { // console.log('response', response) const { - data: { code, msg }, + data: {code, msg, show}, } = response; - // console.log('code', code) + console.log('code', code) if (code === 0 || code === 200) { return response; - } else { - if (code === 1000) { - (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL) - } - console.log("api %o", msg); } - return response; + if (code === 1000) { + (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) + return Promise.reject(response); + } + show && message.error(msg); + console.log("api %o", msg); + return Promise.reject(response); }, function (error) { if (error.message == "timeout of 1ms exceeded") { diff --git a/src/components/Modals/ExportHomeWork.vue b/src/components/Modals/ExportHomeWork.vue index 88db9ff3..ee335405 100644 --- a/src/components/Modals/ExportHomeWork.vue +++ b/src/components/Modals/ExportHomeWork.vue @@ -27,7 +27,7 @@ style="width: 40px; height: 40px; margin-bottom: 16px" src="../../assets/images/leveladd/success.png" /> - 作业导出完成，请下载本地或去下载中心查看 + 作业导出完成，请下载到本地或去下载中心查看
@@ -66,7 +66,7 @@ export default { const downloadHomeWork = () => { // props.url if (props.downloadUrl) { - window.open(props.downloadUrl); + window.open(process.env.VUE_APP_FILE_PATH+props.downloadUrl); } }; console.log("props", props); diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue index 85681b8e..83ee580a 100644 --- a/src/components/TwoDimensionalCode.vue +++ b/src/components/TwoDimensionalCode.vue @@ -47,10 +47,14 @@
复制链接
- 下载二维码 -
+ 下载二维码 +
- -
+
-
京东方商业模型.xls
-
上传失败
-
{{uploadpercent==100?"上传成功":"正在上传"}}
+
{{ fileName }}
+
+ 上传失败 +
+
+ {{ uploadpercent == 100 ? "上传成功" : "正在上传" }} +
-
+
-
{{uploadpercent==-1?0:uploadpercent}}%
-
删除
+
+ {{ uploadpercent == -1 ? 0 : uploadpercent }}% +
+
+ 删除 +
-
-
下载失败数据
+
+
+ 下载失败数据 +
-
+
-
{{succNum}}条数据导入成功，{{errNum}}条数据导入失败
+
+ {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败 +
', info) + console.log("上传成功返回的UUID", info.file.response.data); + console.log("上传成功返回的UUID----->", info); console.log("我是导入学员接口传递的参数", { uploadFile: info.file.originFileObj, targetId: props.courseId, - type: 3 - }) + type: 3, + }); + state.fileName = info.file.name; let i = 0; state.timers = setInterval(() => { - let uid = info.file.response.data; - api - .getImportStatus(uid) - .then((res) => { - console.log("查询导入状态", res); - if (res.data.code === 200) { - if (res.data.data.status !== "START") { - i++; - if (i === 1) { - message.destroy(); - message.success(`${info.file.name}上传成功`); - state.showBottomBar = true; - state.addLoading = false; - state.isAddStudent = true; - } - state.succNum = res.data.data.successNum; - state.errNum = res.data.data.failedNum; - state.downloadErrUrl = res.data.data.url; - clearInterval(state.timers); + let uid = info.file.response.data; + api + .getImportStatus(uid) + .then((res) => { + console.log("查询导入状态", res); + if (res.data.code === 200) { + if (res.data.data.status !== "START") { + i++; + if (i === 1) { + message.destroy(); + message.success(`${info.file.name}上传成功`); + state.showBottomBar = true; + state.addLoading = false; + state.isAddStudent = true; } + state.succNum = res.data.data.successNum; + state.errNum = res.data.data.failedNum; + state.downloadErrUrl = res.data.data.url; + clearInterval(state.timers); } - }) - .catch((err) => { - clearInterval(state.timers); - state.showBottomBar = true; - state.addLoading = false; - console.log("查询导入状态失败", err); - }); + } + }) + .catch((err) => { + clearInterval(state.timers); + state.showBottomBar = true; + state.addLoading = false; + console.log("查询导入状态失败", err); + }); }, 500); } else if (status === "error") { state.addLoading = false; state.uploadErr = true; message.error(`${info.file.name}上传失败`); } - }; // 下载失败数据 const downloadEeeorData = () => { - console.log(state.locationHref + state.downloadErrUrl) - if(state.downloadErrUrl!==""){ - window.open(state.locationHref + state.downloadErrUrl) + if (state.downloadErrUrl !== "") { + window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl); } - } + }; //删除 const removeUpload = () => { @@ -301,7 +357,7 @@ export default { handleChange, BATCH_IMPORT_SCORE, downloadEeeorData, - removeUpload + removeUpload, }; }, }; diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index 929c4873..4ee59150 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -20,7 +20,7 @@
请下载
-
模板
+
模板
，按要求填写数据并导入
@@ -36,7 +36,7 @@ :showUploadList="false" :data="{ type: type, - targetid: Number(id), + targetId: Number(id), }" >

@@ -60,7 +60,7 @@

-
京东方商业模型.xls
+
{{ fileName }}
正在上传
@@ -80,7 +80,7 @@
-
京东方商业模型.xls
+
{{ fileName }}
上传失败
@@ -115,7 +115,7 @@
-
京东方商业模型.xls
+
{{ fileName }}
上传成功
@@ -191,6 +191,7 @@ import { reactive, toRefs } from "vue"; import { message } from "ant-design-vue"; import * as api from "../../api/index1"; import { BATCH_IMPORT_SCORE } from "@/api/config"; +import { useStore } from "vuex"; export default { name: "EScore", props: { @@ -213,6 +214,7 @@ export default { }, }, setup(props, ctx) { + const store = useStore(); const state = reactive({ fileType: ["xls", "xlsx"], importHomeWork: @@ -228,6 +230,9 @@ export default { 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: "", }); const closeDrawer = () => { ctx.emit("update:eScorevisible", false); @@ -261,6 +266,7 @@ export default { // console.log(info.file, info.fileList); } if (status === "done") { + state.fileName = info.file.name; let i = 0; let timer = setInterval(() => { let uid = info.file.response.data; @@ -346,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/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index da45233e..20edd2b4 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -100,7 +100,7 @@ >
描述：
- {{ values?.assessmentQaDescribe }} + {{ values?.content }}
@@ -118,8 +118,8 @@
非常不满意
-
-
{{ iittem }}
+
+
{{ iittem }}
非常满意
@@ -195,7 +195,7 @@ export default { console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ "assessmentSubmitId": props.datasource.assessmentSubmitId, - "courseId": props.datasource.courseId, + "courseId": props.basicdata.assessmentId, "studentId": props.datasource.studentId }).then(res=>{ console.log(res) @@ -225,6 +225,7 @@ export default { }; }, }; +