From b8b0c7fd3cac5cf3ac38f78b3758f3c0a1ff648e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Thu, 17 Nov 2022 11:30:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AD=A6=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E6=A8=A1=E6=9D=BF=E5=92=8C=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=C2=B7=E9=87=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=80=83=E8=AF=95=E6=A0=B7=E5=BC=8F=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddTest.vue | 85 +++++++- src/views/learningpath/LevelAdd.vue | 228 +++++++++++--------- src/views/projectcenter/TemplateLibrary.vue | 34 ++- 3 files changed, 232 insertions(+), 115 deletions(-) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 2f7d1ff7..0432d2e2 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -16,11 +16,11 @@ />
- 系统考试 - 外部考试 + :class="[isOuter == 1? 'outer' : 'notOuter' ]">系统考试 +
- - + + + + 选择试卷 + + + + + + {{item.value}} +
@@ -274,10 +292,29 @@ export default { showAnalysis:2, showAnswers:2, choosedTime:'', + choosedTest:[ + { + key:1, + value:'提高核心竞争力' + }, + { + key:2, + value:'增强创新意识感' + }, + { + key:3, + value:'巩固基础求发展' + }, + ], + }); const state = reactive({ addLoading: false, isOuter:1, // 是否为外部考试 + choosedTestList:[{ + value:'提高核心竞争力', + key:1, + }], }) const formRef = ref(); let checkExaminationName = async (_rule, value) => { @@ -555,6 +592,16 @@ export default { console.log(value) state.isOuter = value } + const chooseTest = (index) => { + for(let i in state.choosedTestList ) { + if(state.choosedTestList[i].key == formState.choosedTest[index].key) return; + } + state.choosedTestList.push(formState.choosedTest[index]) + } + const closeTag = (removedTag) => { + const tags = state.choosedTestList.filter(item => item.key != removedTag); + state.choosedTestList = tags; + } return { formState, afterVisibleChange, @@ -574,6 +621,8 @@ export default { updateTest, queryTest, changeOuter, + chooseTest, + closeTag, ...toRefs(state) }; }, @@ -583,6 +632,26 @@ export default { .ant-table-striped :deep(.table-striped) td { background-color: #fafafa !important; } +.outer { + background-color: #4ea6ff; + color: #fff; + border-radius: 5px; + border:1px solid #a09292; + height: 36px; + margin-right: 10px; +} +.notOuter { + color: #000; + border-radius: 5px; + border:1px solid #a09292; + background:#fff; + margin-right: 10px; + padding:3px; +} +.tag-style { + color:rgb(113, 113, 237); + background-color:#d7d1f7; +} .addtestDrawer { .drawerMain { .header { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 391164a5..b363e8c2 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -560,14 +560,14 @@ style="width: 270px; height: 40px; border-radius: 8px" placeholder="关卡名称" /> -
+
-
搜索
+ 搜索
-
+
-
重置
+ 重置
@@ -821,6 +821,13 @@
+ + + { showCheckStu(text.record.studentId); + state.Seevisible = true; }} style="color:#4EA6FF;margin-right:25px;cursor:pointer" > @@ -1610,89 +1622,6 @@ export default { getOverview(); reget(); }); - - // 获取项目概览 - const getOverview = () => { - getRouterOverview(state.routerId) - .then((res) => { - Object.keys(res.data.data.routerInfoOverview).forEach((item) => { - levelList.routerInfoOverview[item] = - res.data.data.routerInfoOverview[item] || 0; - }); - Object.keys(res.data.data.chapterOverviewList).forEach((item) => { - levelList.chapterOverviewList[item] = - res.data.data.chapterOverviewList[item] || 0; - }); - // res.data.data.routerInfoOverview.forEach((r) => { - // console.log(r) - // }) - state.addLoading = false; - console.log("项目概览--" + res); - }) - .catch((err) => { - state.addLoading = false; - message.error("概览获取失败"); - console.log("获取失败" + err); - }); - }; - // 获取路径列表 - const myGetRouterDetail = () => { - GetRouterDetail(state.routerId) - .then((res) => { - let data = res.data.data.chapterList; - - state.taskSyllabus = data; - // for(let i in data) { - // state.taskSyllabus[i].name = data[i].name - // if(data[i].taskList.length > 0) { - // for(let j in data[i].taskList) { - // Object.keys(data[i].taskList[j]).forEach(item => { - // state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0 - // }) - // } - // } - - // } - }) - .catch((err) => { - console.log(err); - message.error("获取路径列表失败" + err); - }); - }; - - const handleChange = (info) => { - if (info.file.status !== "uploading") { - console.log(info.file, info.fileList); - } - - if (info.file.status === "done") { - message.success(`${info.file.name} 文件上传成功`); - } else if (info.file.status === "error") { - message.error(`${info.file.name} 文件上传失败.`); - } - }; - - const delConfirm = (id) => { - Modal.confirm({ - title: "是否确认删除", - icon: createVNode(ExclamationCircleOutlined), - content: "", - okText: "确认", - cancelText: "取消", - onOk() { - api - .delStudent({ routerId: 100, studentIds: [id] }) - .then((res) => { - message.success("删除成功"); - console.log(res); - }) - .catch((err) => { - message.error("删除失败" + err); - console.log(err); - }); - }, - }); - }; const closePub = () => { state.pub = false; }; @@ -1850,7 +1779,96 @@ export default { : "-"; }); }; + // 获取项目概览 + const getOverview = () => { + getRouterOverview(state.routerId) + .then((res) => { + Object.keys(res.data.data.routerInfoOverview).forEach((item) => { + levelList.routerInfoOverview[item] = + res.data.data.routerInfoOverview[item] || 0; + }); + Object.keys(res.data.data.chapterOverviewList).forEach((item) => { + levelList.chapterOverviewList[item] = + res.data.data.chapterOverviewList[item] || 0; + }); + // res.data.data.routerInfoOverview.forEach((r) => { + // console.log(r) + // }) + state.addLoading = false; + console.log("项目概览--" + res); + }) + .catch((err) => { + state.addLoading = false; + message.error("概览获取失败"); + console.log("获取失败" + err); + }); + }; + // 获取路径列表 + const myGetRouterDetail = () => { + GetRouterDetail(state.routerId) + .then((res) => { + let data = res.data.data.chapterList; + state.taskSyllabus = data; + // for(let i in data) { + // state.taskSyllabus[i].name = data[i].name + // if(data[i].taskList.length > 0) { + // for(let j in data[i].taskList) { + // Object.keys(data[i].taskList[j]).forEach(item => { + // state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0 + // }) + // } + // } + + // } + }) + .catch((err) => { + console.log(err); + message.error("获取路径列表失败" + err); + }); + }; + + const handleChange = (info) => { + if (info.file.status !== "uploading") { + console.log(info.file, info.fileList); + } + + if (info.file.status === "done") { + message.success(`${info.file.name} 文件上传成功`); + } else if (info.file.status === "error") { + message.error(`${info.file.name} 文件上传失败.`); + } + }; + + const delConfirm = (id) => { + Modal.confirm({ + title: "是否确认删除", + icon: createVNode(ExclamationCircleOutlined), + content: "", + okText: "确认", + cancelText: "取消", + onOk() { + api + .delStudent({ routerId: 100, studentIds: [id] }) + .then((res) => { + message.success("删除成功"); + console.log(res); + }) + .catch((err) => { + message.error("删除失败" + err); + console.log(err); + }); + }, + }); + }; + const searchLevel = () => { + const result = state.tableData.filter(item => item.cur == state.gatenamee) + state.tableData = result; + }; + const resetLevel = () => { + state.gatenamee = ''; + getStudent(); + }; return { ...toRefs(state), ...toRefs(levelList), @@ -1881,6 +1899,8 @@ export default { checkType, handleChange, delConfirm, + searchLevel, + resetLevel, closePub, releaseLearnPath, showPub, @@ -1899,12 +1919,6 @@ export default { };