diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index aa4fe5c2..d3c2bb85 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -668,7 +668,7 @@
- + { if (res.data.code == 200) { @@ -238,6 +238,10 @@ defineExpose({ openDrawer }); } .growth-homework { + .ant-spin-container, + .ant-spin-nested-loading { + height: 100%; + } .drawerMain { .header { height: 73px; @@ -262,7 +266,7 @@ defineExpose({ openDrawer }); .main_left { flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; padding-right: 0px; diff --git a/src/components/growthpath/GrowthLive.vue b/src/components/growthpath/GrowthLive.vue index 63d5e9cb..b35e77ea 100644 --- a/src/components/growthpath/GrowthLive.vue +++ b/src/components/growthpath/GrowthLive.vue @@ -612,7 +612,7 @@ const beforeUpload = (file) => { .contentMain { .main_left { flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/components/growthpath/GrowthRef.vue b/src/components/growthpath/GrowthRef.vue index 85994915..8cecbebe 100644 --- a/src/components/growthpath/GrowthRef.vue +++ b/src/components/growthpath/GrowthRef.vue @@ -191,6 +191,10 @@ defineExpose({ openDrawer }); } .growth-ref { + .ant-spin-container, + .ant-spin-nested-loading { + height: 100%; + } .drawerMain { .header { height: 73px; @@ -216,7 +220,7 @@ defineExpose({ openDrawer }); .main_left { padding-right: 30px; flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/components/growthpath/GrowthVote.vue b/src/components/growthpath/GrowthVote.vue index 80607a37..d0c75772 100644 --- a/src/components/growthpath/GrowthVote.vue +++ b/src/components/growthpath/GrowthVote.vue @@ -277,7 +277,12 @@ defineExpose({ openDrawer }); .ant-table-striped :deep(.table-striped) td { background-color: #fafafa !important; } - +::v-deep.ant-spin-nested-loading { + height: 100%; + .ant-spin-container { + height: 100%; + } +} .growth-vote { .drawerMain { .header { @@ -304,7 +309,7 @@ defineExpose({ openDrawer }); .main_left { padding-right: 30px; flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue index 12e7b20b..441919eb 100644 --- a/src/views/growthpath/PathManage.vue +++ b/src/views/growthpath/PathManage.vue @@ -1131,7 +1131,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_EXAM_DETAIL_URL + - item.info.examinationPaperId; + item.info.examinationTestId; } } // 直播结束时间 diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 63d25a5e..5818f2e5 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -363,14 +363,14 @@ export default { width: 120, align: "center", }, - { - title: "专业力学习", - dataIndex: "growthStudy", - ellipsis: true, - key: "growthStudy", - width: 120, - align: "center", - }, + // { + // title: "专业力学习", + // dataIndex: "growthStudy", + // ellipsis: true, + // key: "growthStudy", + // width: 120, + // align: "center", + // }, { title: "学习时长", dataIndex: "learningDuration", diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index aedf7211..6ac95365 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -106,10 +106,10 @@ label: '学习路径图', value: 6, }, - { - label: '专业力必修', - value: 7, - }, + // { + // label: '专业力必修', + // value: 7, + // }, ]" > diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index b6bd7ba6..c673753b 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -392,7 +392,7 @@ export default { { text: "课程", num: res.data.result?.courseTotal }, { text: "考试", num: res.data.result?.examTotal }, { text: "案例", num: res.data.result?.caseTotal }, - { text: "专业力", num: res.data.result?.growthTotal }, + // { text: "专业力", num: res.data.result?.growthTotal }, ]; tabData.value = list; }); @@ -1009,7 +1009,7 @@ export default { { text: "课程", num: "11" }, { text: "考试", num: "10" }, { text: "案例", num: "10" }, - { text: "专业力必修", num: "10" }, + // { text: "专业力必修", num: "10" }, ]); const tabClick = (index) => { state.selectedRowKeys = [];