diff --git a/.gitignore b/.gitignore index cd5df5a8..5e297b87 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ fe-manage.iml package-lock.json src/api/config.js src/api/config.js +src/api/config.js diff --git a/src/App.vue b/src/App.vue index 4cfe69fb..01c9c500 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("版本0.9.10------------"); + console.log("版本0.9.12------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 028b7583..b726a884 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-11 18:17:05 + * @LastEditTime: 2022-12-13 09:24:16 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", '_self'); + window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js index e86bc277..d5a18baf 100644 --- a/src/api/indexAudit.js +++ b/src/api/indexAudit.js @@ -7,7 +7,7 @@ export const list = (obj) => http.post('/admin/offcourse/listToBeReviewed', obj) //获取待审核项目列表 export const projlist = (obj) => http.post('/admin/project/list', obj) -//获取待审核项目列表 +//获取项目审核日志 export const auditlist = (obj) => http.post('/admin/project/auditlist', obj) //获取已审核项目列表 diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index b5e57c20..65dbfae8 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -70,7 +70,7 @@ export default { href: "/leveladd", }, { - name: "关卡", + name: "管理", }, ]; } diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index a23dde18..c52af5b3 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -203,6 +203,7 @@ --> + + > - + --> +
@@ -383,6 +385,10 @@ export default { }; const updateTask = async (res) => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } await RouterEditTask({ chapterId: props.isactive, courseId: res.data.data.activityId, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index ef1de636..6621e360 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -275,6 +275,10 @@ export default { }; const updateTask = () => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 2c5bb0fd..5b39e01a 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -191,6 +191,10 @@ export default { } }; const updateTask = async (res) => { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } if (props.isLevel == 1) { await RouterEditTask({ chapterId: props.isactive, diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 2569d3d3..28c69f5a 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -177,6 +177,10 @@ export default { }; //向关卡或阶段渲染 const updateTask = async (value) => { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } if (props.isLevel == 1) { await RouterEditTask({ chapterId: props.isactive, @@ -249,8 +253,8 @@ export default { state.description = res.data.data.evaluationExplain; }) .catch((err) => { - message.destroy() - message.error("获取测量平信息失败"); + //message.destroy() + // message.error("获取测量平信息失败"); console.log(err, "erererrerererererer"); }); } diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 5c87fe1b..5b642080 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -27,7 +27,7 @@ alt="" />
- 课程任务名称： + 任务名称：
面授时间：
-
- + { console.log("props.isLevel=====", props.isLevel); + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } if (props.isLevel == 1) { let editObj1 = { chapterId: props.isactive, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 24ef538a..98729780 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -394,6 +394,10 @@ export default { state.EditWorkId = res.data.data.workId; } else { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } let editObj1 = { chapterId: props.isactive, courseId: res.data.data.workId, diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index a99f7b08..1ba2c07a 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -163,6 +163,10 @@ export default { l_data_id.push(Number(state.assessmentId)) console.log("state.assessment",state.assessment,state.assessmentId); if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } IsExistence({ chapterId: Number(props.isactive), courseTaskId:l_data_id, diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index a9ddda1d..ea937b01 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -38,21 +38,26 @@ />
-
+
- 直播说明： +
+ +
+ 直播链接：
-
- +
+
@@ -148,19 +153,28 @@
-
+
- 直播链接： +
+ +
+ 直播公告：
-
- +
+
回放设置： @@ -184,6 +198,8 @@
+ +
直播说明： @@ -191,7 +207,7 @@
-->
- + + +
评估： @@ -454,6 +473,7 @@ export default { switchC1: "", checkedC1: false, checkedC2: false, + liveNotice :null, assessmentId: null, obj: {}, //要传的obj数据 assessment: [], //评估信息 @@ -483,6 +503,9 @@ export default { state.needEval = false; state.switchC2 = false; state.assessmentId = null; + state.liveNotice =null; + state.liveTeacherId=null; + state.memberValue={}; ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); @@ -532,7 +555,7 @@ export default { state.inputV8 = res.data.data.signOutTime; state.textV1 = res.data.data.liveExplain; state.radioV1 = Number(res.data.data.standardSettings); - //state.= res.data.data + state.liveNotice = res.data.data.liveNotice; state.assessmentId = res.data.data.assessmentId; state.imageUrl = res.data.data.liveCover; state.switchC1 = res.data.data.livePlayback === "1" ? true : false; @@ -577,6 +600,10 @@ export default { }; const updateTask = (res) => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } RouterEditTask({ chapterId: props.isactive, courseId: res.data.data.liveId, @@ -641,6 +668,11 @@ export default { message.destroy(); return message.warning("请输入直播名称"); } + if (!state.inputV4) { + message.destroy(); + return message.warning("请输入直播链接"); + } + if (!state.time) { message.destroy(); return message.warning("请输入直播时间"); @@ -657,6 +689,10 @@ export default { message.destroy(); return message.warning("请上传封面"); } + if (!state.liveNotice) { + message.destroy(); + return message.warning("请输入直播公告"); + } const regular = /^[+]{0,1}(\d+)$/; if (!regular.test(state.inputV2)) { message.destroy(); @@ -682,6 +718,7 @@ export default { liveEndTime: endTime, liveStartTime: startTime, liveExplain: state.textV1, + liveNotice:state.liveNotice, liveFlag: "", liveId: props.edit ? Number(props.EditLiveId) : 0, liveLink: state.inputV4, diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 0b09deaf..d4114a0d 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -36,7 +36,7 @@ />
- {{ inputV1 ? inputV1.length : 0 }}/20 +
@@ -464,6 +464,10 @@ export default { const updateTask = () => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } console.log("我是要便利的数据2", state.addOnlineList); let l_data = state.addOnlineList; let l_data_id = []; diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 002efd2a..04f75503 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -551,6 +551,10 @@ export default { const updateTask = async (res) => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } await RouterEditTask({ chapterId: props.isactive, courseId: res.key, diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index d3869f60..62537d96 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -182,6 +182,10 @@ export default { }; const updateTask = async (res) => { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } RouterEditTask({ chapterId: props.isactive, courseId: res.data.data.linkId, diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index ac4f92fd..b02f68ea 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -570,6 +570,10 @@ export default { closeDrawer(); } else { if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } let editObj1 = { chapterId: props.isactive, duration: res.data.data.examinationDuration, diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue index a7685648..15dccaec 100644 --- a/src/components/drawers/SelFacet.vue +++ b/src/components/drawers/SelFacet.vue @@ -58,6 +58,7 @@
+ +
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue index e8a14efe..6f92741c 100644 --- a/src/components/project/NameInput.vue +++ b/src/components/project/NameInput.vue @@ -1,10 +1,13 @@ @@ -18,7 +21,7 @@ const props = defineProps({ }, validate: { type: Boolean, - default: true + default:true }, id: { type: String, @@ -55,9 +58,52 @@ watch(modelV, () => { }) function validateProName() { + emit('update:finished', false); props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => { emit('update:validate', res.data.data !== 1) + emit('update:finished', true); }) } + \ No newline at end of file diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index fa01f169..72c82170 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -8,7 +8,7 @@ v-model:value="id" style="width: 100%" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" - placeholder="自动带出 可修改" + placeholder="请选择归属组织" allow-clear :tree-data="options" :fieldNames="{ diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index f765c30d..37dd191e 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -32,7 +32,7 @@
@@ -102,7 +102,7 @@
起止时间：
-
+
{ console.log("props.isLevel=====", props.isLevel); if (props.isLevel == 1) { + if(!props.isactive){ + message.destroy(); + return message.warning("请先选中关卡"); + } RouterEditTask({ chapterId: props.isactive, courseId: res.data.data.voteId, @@ -661,7 +665,29 @@ export default { } } } + .in { + element.style { + border-radius: 8px; + } + + .ant-input-affix-wrapper { + position: relative; + display: inline-block; + width: 132%; + /* min-width: 19px; */ + padding: 4px 11px; + color: rgba(0, 0, 0, 0.85); + font-size: 14px; + line-height: 1.5715; + background-color: #fff; + background-image: none; + border: 1px solid #d9d9d9; + border-radius: 2px; + transition: all 0.3s; + display: inline-flex; + } + } .main_item2 { display: flex; align-items: flex-start; @@ -670,7 +696,7 @@ export default { width: 423px; .ant-input { - width: 100%; + width:355px; } .ant-input-textarea-show-count { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index a3facece..930dc096 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -145,6 +145,7 @@ placeholder="请输入课程名称" v-model:value="xzinputV1" v-model:validate="validate" + v-model:finished="finished" :maxlength="20" show-count :type="2" @@ -306,6 +307,7 @@ @@ -364,6 +366,7 @@ placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate" + v-model:finished="finished" :maxlength="20" show-count :type="2" @@ -628,8 +631,8 @@ 授课教师
-
- + @@ -2010,18 +2013,20 @@ />
+ +
附件 @@ -2145,6 +2150,9 @@
+
+ +
@@ -2793,6 +2801,7 @@ import { onBeforeUnmount, watch, } from "vue"; + import * as api from "../../api/indexInvist.js"; import { message } from "ant-design-vue"; @@ -3547,7 +3556,7 @@ export default defineComponent({ value4: "", //选择线上还是面授 xzinputV1: "", - valueE1: 2, + valueE1: "", valueE2: "", //确定面授 ft_eidt: false, @@ -3591,7 +3600,7 @@ export default defineComponent({ imageUrl: "", imgList: [], - validate: true, + validate:false, pageSize2: 10, currentPage2: 0, @@ -3638,6 +3647,7 @@ export default defineComponent({ codevisible: false, //二维码弹窗 codeInfo: null, //二维码内容 codeUrl: codeUrl, + finished:false, // 课程三级分类 options2222: [ { @@ -4540,15 +4550,26 @@ export default defineComponent({ message.destroy(); return message.warning("请输入必填项"); } - if (!state.validate) { + + console.log("state.validate",state.validate); + if(!state.finished){ + return; + } + + if (!state.validate && state.finished) { message.destroy(); - return message.warning("路径图名称重复"); + return message.warning("该课程名称已存在"); } console.log( "state.bs_hs && state.valueE1 == 2", state.bs_hs, state.valueE1 == 2 ); + if( !state.valueE1 && !state.valueE2){ + message.destroy(); + return message.warning("请选择课程形式"); + } + if (state.valueE1 === 2) { state.of_hs = false; @@ -4659,7 +4680,7 @@ export default defineComponent({ } if (!state.validate) { message.destroy(); - return message.warning("路径图名称重复"); + return message.warning("面授课名称重复"); } edit(postData).then((res) => { if (res.data.code === 200) { @@ -4713,6 +4734,7 @@ export default defineComponent({ }; //保存开课 const handleSureStu = () => { + state.addLoading = true; let startTime, endTime = 0; if (state.xjkkinputV3) { @@ -5772,7 +5794,7 @@ export default defineComponent({ } .aeLoading { - z-index: 10000; + z-index: 100000; } .courseManage { diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index c33b1703..3fd5d40c 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -81,7 +81,7 @@ -
+
课程价值：
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 35f80999..104673b8 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -378,6 +378,9 @@
+
+ +