diff --git a/src/components/img/UploadImgHomeWork.vue b/src/components/img/UploadImgHomeWork.vue index c544b72..126d3df 100644 --- a/src/components/img/UploadImgHomeWork.vue +++ b/src/components/img/UploadImgHomeWork.vue @@ -51,10 +51,15 @@ function handleChange(file) { f.uid = file.uid; file.raw = f; console.log(file.raw) - if(file.raw.name.includes('.mp4') || file.raw.name.includes('.jpeg')){ + if(file.raw.name.includes('.mp4') || file.raw.name.includes('.MP4')){ files.value = [] emit('update:value', files.value) - ElMessage.error(`暂不支持此格式文件上传`); + ElMessage.error(`暂不支持视频文件上传`); + return + }else if(file.raw.name.includes('.jpeg') || file.raw.name.includes('.JPEG')){ + files.value = [] + emit('update:value', files.value) + ElMessage.error(`暂不支持jpeg格式图片文件上传`); return }else{ imageRef.value.submit(); diff --git a/src/store/index.js b/src/store/index.js index 8796c5a..9701359 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -38,8 +38,8 @@ export default createStore({ const stageState = t.taskProcessList?.some((s) => { s.unlock = true; s.statusName = "已完成"; - s.status === 2 ? (s.statusName = "进行中") : (!s.status && (s.statusName = TASK_TYPES.toName[s.type])); - return state.projectInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag); + s.status !== 1 && (s.statusName = TASK_TYPES.toName[s.type]) + return state.projectInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag) }); stageState && (t.statusName = "进行中"); return stageState; diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 0bc26ee..b17b6d6 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -277,12 +277,12 @@ -
此课程无附件
-
-
- 下载 -
- +
+ 下载 +
@@ -372,9 +372,10 @@ const {activeName, enclosure, isAllowSign} = toRefs(state); const handleClick = (tab, event) => { console.log("附件", tab, event); }; +const fielPath = ref(import.meta.env.VITE_FILE_PATH); const download = (url) => { - // console.log('下载url',url) - window.open(url); + console.log('下载url',fielPath.value+url) + window.open(fielPath.value+url); }; const downloads = (url) => { ElMessage.warning("未在有效时间范围内,请耐心等待!"); diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index b098e3e..b5507c5 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -364,7 +364,7 @@ const { commit, dispatch, state } = useStore() const store = useStore() const userInfo = computed(() => state.userInfo) const data = computed(() => state.projectInfo) - +console.log(data) onMounted(() => { dispatch('getProjectInfo', { projectId }) })