diff --git a/src/hooks/useOrgName.js b/src/hooks/useOrgName.js new file mode 100644 index 0000000..78d73cf --- /dev/null +++ b/src/hooks/useOrgName.js @@ -0,0 +1,23 @@ +/**截取机构名称路径namePath最后两段,不包含第一个 */ +const useOrgName = (namePath) => { + let newName = namePath; + if (newName) { + let names = newName.split(','); + let len = names.length; + //使用最后两们 + if (len > 1) { + newName = names[1]; + if (!newName) { + newName = names[0] + } + } + } + return newName; +}; + + + + +export { + useOrgName +} \ No newline at end of file diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index ef57659..52dfbc6 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -307,6 +307,7 @@ import {useUserInfo} from "@/api/utils"; import {ElMessage} from "element-plus"; import dayjs from "dayjs"; import isBetween from "dayjs/plugin/isBetween"; +import { useOrgName } from "@/hooks/useOrgName.js"; const router = useRouter(); @@ -326,15 +327,7 @@ const { data } = useRequest(STU_OFFCOURSE_DETAIL, { // 获取组织名称 const cutOrgNamePath = computed(() => { let newName = data.value?.offcourseDto?.organizationNames; - if(newName){ - let names=newName.split(','); - let len=names.length; - //使用最后两们 - if(len>1){ - newName=names[0]; - } - } - return newName; + return useOrgName(newName); }) const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId)); const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.planDto?.beforeStart || 0, "minute"), dayjs(data.value.planDto?.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.planDto?.afterStart || 0, "minute"))); diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue index 7140d7f..4917219 100644 --- a/src/views/faceteach/FaceTeachNoCommon.vue +++ b/src/views/faceteach/FaceTeachNoCommon.vue @@ -123,6 +123,7 @@ import {useRoute, useRouter} from "vue-router"; import {useUserInfo} from "@/api/utils"; import {ElMessage, messageConfig} from "element-plus"; import dayjs from "dayjs"; +import { useOrgName } from "@/hooks/useOrgName.js"; const router = useRouter(); const returnclick = () => { @@ -136,15 +137,7 @@ const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); // 获取组织名称 const cutOrgNamePath = computed(() => { let newName = data.value?.offcourseDto?.organizationNames; - if(newName){ - let names=newName.split(','); - let len=names.length; - //使用最后两们 - if(len>1){ - newName=names[0]; - } - } - return newName; + return useOrgName(newName); }) const teacherInfo = useUserInfo( diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue index e5e69f9..eb451ab 100644 --- a/src/views/faceteach/FaceTeachNoCourse.vue +++ b/src/views/faceteach/FaceTeachNoCourse.vue @@ -120,6 +120,7 @@ import {useRoute, useRouter} from "vue-router"; import {useUserInfo} from "@/api/utils"; import {ElMessage, messageConfig} from "element-plus"; import dayjs from "dayjs"; +import { useOrgName } from "@/hooks/useOrgName.js"; const router = useRouter(); const returnclick = () => { @@ -133,15 +134,7 @@ const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); // 获取组织名称 const cutOrgNamePath = computed(() => { let newName = data.value?.offcourseDto?.organizationNames; - if(newName){ - let names=newName.split(','); - let len=names.length; - //使用最后两们 - if(len>1){ - newName=names[0]; - } - } - return newName; + return useOrgName(newName); }) const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId)); diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 120547b..88b8fd5 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -335,6 +335,7 @@ import {useUserInfo} from "@/api/utils"; import {ElMessage, messageConfig} from "element-plus"; import dayjs from "dayjs"; import isBetween from "dayjs/plugin/isBetween"; +import { useOrgName } from "@/hooks/useOrgName.js"; const router = useRouter(); onBeforeMount(() => dayjs.extend(isBetween)); @@ -347,15 +348,7 @@ console.log(data.value); // 获取组织名称 const cutOrgNamePath = computed(() => { let newName = data.value?.offcourseDto?.organizationNames; - if(newName){ - let names=newName.split(','); - let len=names.length; - //使用最后两们 - if(len>1){ - newName=names[0]; - } - } - return newName; + return useOrgName(newName); }) const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId)); diff --git a/src/views/faceteach/FaceTeachStuSign.vue b/src/views/faceteach/FaceTeachStuSign.vue index 1294d01..178e1b4 100644 --- a/src/views/faceteach/FaceTeachStuSign.vue +++ b/src/views/faceteach/FaceTeachStuSign.vue @@ -157,6 +157,7 @@ import {useUserInfo} from "@/api/utils"; import {ElMessage} from "element-plus"; import dayjs from "dayjs"; import isBetween from "dayjs/plugin/isBetween"; +import { useOrgName } from "@/hooks/useOrgName.js"; const router = useRouter(); @@ -170,15 +171,7 @@ const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId, usePermission: tru // 获取组织名称 const cutOrgNamePath = computed(() => { let newName = data.value?.offcourseDto?.organizationNames; - if(newName){ - let names=newName.split(','); - let len=names.length; - //使用最后两们 - if(len>1){ - newName=names[0]; - } - } - return newName; + return useOrgName(newName); }) const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId)); const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value?.planDto?.beginTime).subtract(data.value?.planDto?.beforeStart || 0, "minute"), dayjs(data.value?.planDto?.afterStart ? data.value?.planDto?.beginTime : data.value?.planDto?.endTime).add(data.value?.planDto?.afterStart || 0, "minute")));