From d8e0b3c1b51fa11c0510731a64f68445e75cfac1 Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 19 Dec 2022 20:45:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 2 +- src/assets/scss/common.scss | 53 +- src/views/learningpath/LearningPath.vue | 37 +- src/views/learningpath/LevelAdd.vue | 101 +- src/views/projectcenter/ProjectManage.vue | 10 +- src/views/projectcenter/TaskPage.vue | 1542 +++++++++++---------- src/views/research/ResearchManage.vue | 6 +- 7 files changed, 894 insertions(+), 857 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index d741c2df..6d49d284 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -138,7 +138,7 @@ export async function request(_url, params) { } } const body = method !== 'get' ? params || {} : {} - url = process.env.VUE_APP_BOE_API_URL + url + // url = process.env.VUE_APP_BOE_API_URL + url return fetch(url, { method, headers: { diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index a8adc8b1..00bd95e6 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -51,31 +51,37 @@ body { height: 6px; /*对水平流动条有效*/ } + ::-o-scrollbar { width: 6px; /*对垂直流动条有效*/ height: 6px; /*对水平流动条有效*/ } + .scrollbar { width: 6px; /*对垂直流动条有效*/ height: 6px; /*对水平流动条有效*/ } + /*定义滚动条的轨道颜色、内阴影及圆角*/ ::-webkit-scrollbar-track { background-color: rgba(239, 244, 252, 1); border-radius: 6px; } + ::-moz-scrollbar-track { background-color: rgba(239, 244, 252, 1); border-radius: 6px; } + ::-o-scrollbar-track { background-color: rgba(239, 244, 252, 1); border-radius: 6px; } + .scrollbar-track { background-color: rgba(239, 244, 252, 1); border-radius: 6px; @@ -86,14 +92,17 @@ body { border-radius: 3px; background-color: rgba(78, 166, 255, 1); } + ::-moz-scrollbar-thumb { border-radius: 3px; background-color: rgba(78, 166, 255, 1); } + ::-o-scrollbar-thumb { border-radius: 3px; background-color: rgba(78, 166, 255, 1); } + .scrollbar-thumb { border-radius: 3px; background-color: rgba(78, 166, 255, 1); @@ -104,35 +113,43 @@ body { background-color: cyan; display: none; } + ::-moz-scrollbar-button { background-color: cyan; display: none; } + ::-o-scrollbar-button { background-color: cyan; display: none; } + .scrollbar-button { background-color: cyan; display: none; } + /*定义右下角汇合处的样式*/ ::-webkit-scrollbar-corner { background: rgba(239, 244, 252, 1); ; } + ::-moz-scrollbar-corner { background: rgba(239, 244, 252, 1); ; } + ::-o-scrollbar-corner { background: rgba(239, 244, 252, 1); ; } + .scrollbar-corner { background: rgba(239, 244, 252, 1); ; } + //隐藏滚动条---------------------------------------------------------------- //禁止选中---------------------------------------------------------- @@ -329,7 +346,8 @@ textarea { //抽屉-------------------------------------------------------- .drawerStyle { - // transform: translateX(0px) !important; + + // transform: translateX(0px) !important; .ant-drawer-content-wrapper { max-width: 1050px; @@ -437,29 +455,34 @@ textarea { } } -.ant-modal{ - .modalHeader{ - background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; +.ant-modal { + .modalHeader { + background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; } - .top{ - background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + + .top { + background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; } - .del_header{ - background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + + .del_header { + background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; } } + //弹窗-------------------------------------------------------- //loading-------------------------------------------------------- .aeLoading { width: 100%; height: 100%; -background: rgba(0, 0, 0, 0.2); -display: flex; -align-items: center; -justify-content: center; -position: absolute; -left: 0; -top:0, + background: rgba(0, 0, 0, 0.2); + display: flex; + align-items: center; + justify-content: center; + position: absolute; + left: 0; + top: 0; + z-index: 100 } + //loading-------------------------------------------------------- \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 69f732e7..46fead1f 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -203,7 +203,7 @@ - +
- +
@@ -278,7 +278,7 @@ />
路径图名称
-
+
@@ -332,7 +332,7 @@ - +
{ state.pathName = ""; state.pathBg = ""; - state.pathBgId =1; + state.pathBgId = 1; state.organizationSelectName = null; state.organizationSelectId = null; state.pathIntro = ""; @@ -908,12 +908,12 @@ export default { let stuobj = { pageNo: 1, pageSize: 10, - routerId: router.id, + pid: router.id, + type: 2, }; - api - .getStudent(stuobj) + getStuPage(stuobj) .then((res) => { - console.log("获取学员列表", res.data.data.total); + console.log("获取学员列表", res.data); if (res.data.code === 200) { state.routeStudentsNum = res.data.data.total; state.pubLoading = false; @@ -1175,7 +1175,7 @@ export default { key: "opacation", width: "20%", align: "center", - // fixed: "right", + // fixed: "right", scopedSlots: { customRender: "action" }, //引入的插槽 customRender: (text) => { // console.log(text); @@ -1626,17 +1626,16 @@ export default { arr.forEach((item) => { if (item.dictValue === state.pathBg) { state.pathBgId = item.dictCode; - } }); //for (let i = 0; i < arr.length; i++) { - // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg); + // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg); // if (arr[i].dictValue === state.pathBg) { - // state.pathBgId = arr[i].dictCode; + // state.pathBgId = arr[i].dictCode; - // } - // } + // } + // } } }) .catch((err) => { @@ -1745,7 +1744,7 @@ export default { state.searchdate = null; state.startTime = null; state.endTime = null; - state.createUser=null; + state.createUser = null; getLearnPath(); }; @@ -1803,7 +1802,7 @@ export default { // state.imgData = ; // } }); - const imgData = computed(()=>store.state.pathmapPic) + const imgData = computed(() => store.state.pathmapPic); //添加权限 watch( () => state.addAuthList, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index adb871c6..f7ed9e15 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -10,26 +10,27 @@
创建时间：{{ cretime }}
- -
- - -
- {{ act }} +
+ + +
+ {{ act }} +
-
+ >
返回
@@ -507,7 +508,7 @@ - - { console.log("获取学员列表", res.data.data.total); if (res.data.code === 200) { @@ -1695,14 +1696,13 @@ export default { console.log("获取学员列表失败", err); }); }; - const pubIcon =(action)=>{ - if(action ==1){ + const pubIcon = (action) => { + if (action == 1) { showBackModal(); - }else{ + } else { showPub(); } - - } + }; //显示撤回弹窗 const showBackModal = () => { state.backModal = true; @@ -1868,7 +1868,10 @@ export default { state.nodata = false; } let data = res.data.data.chapterList; - state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name})) + state.stage = res.data.data.chapterList.map((e) => ({ + id: e.chapterId, + name: e.name, + })); state.taskSyllabus = data; // for(let i in data) { // state.taskSyllabus[i].name = data[i].name @@ -2851,23 +2854,23 @@ export default { background-color: #e8effa; margin-right: 28px; } - .pubIcon{ + .pubIcon { display: flex; align-items: center; .img2 { - width: 42px; - height: 42px; - margin-right: 22px; - } + width: 42px; + height: 42px; + margin-right: 22px; + } - .pub { - color: #ffb64e; - font-size: 14px; - margin-top: 5px; - margin-right: 30px; - cursor: pointer; - } + .pub { + color: #ffb64e; + font-size: 14px; + margin-top: 5px; + margin-right: 30px; + cursor: pointer; + } } .img2 { @@ -4262,7 +4265,5 @@ export default { } } } - - } diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 2964c0a0..1d398ef2 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -51,7 +51,6 @@ format="YYYY-MM-DD" style="border-radius: 8px; height: 40px; margin-left: 5px" :placeholder="[' 开始时间', ' 结束时间']" - />
@@ -829,7 +828,7 @@ import { changeOwnership } from "@/api/method"; import NameInput from "@/components/project/NameInput"; import { validateName } from "@/api/index1"; //import { toDate } from "../../api/method"; - +import { getStuPage } from "@/api/index1"; export default { name: "projectManage", components: { @@ -1050,10 +1049,10 @@ export default { let obj = { pageNo: 0, pageSize: 0, - projectId: object.projectId, + pid: object.projectId, + type: 1, }; - api - .projectStudent(obj) + getStuPage(obj) .then((res) => { if (res.data.code === 200) { // console.log("res", res.data); @@ -1699,7 +1698,6 @@ export default { state.searchParam.valueDate && state.searchParam.valueDate.length === 2 ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD") - : "", endTime: state.searchParam.valueDate && diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index ce26f4c2..5a5c991f 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3,7 +3,7 @@
- +
{{ name }}
@@ -29,74 +29,74 @@ >
-->
{{ act }}
{{ act }}
{{ act }}
{{ act }}
@@ -171,7 +171,7 @@
- +
返回
 @@ -180,11 +180,11 @@
@@ -196,8 +196,8 @@
- +
- +
- +
添加任务 @@ -222,18 +222,18 @@
快速添加任务/阶段
- +
- +
- +
添加学员 @@ -271,27 +271,27 @@
{{ - projectInfoOverview.totalStudentCnt - }} + projectInfoOverview.totalStudentCnt + }}
总人数
{{ - projectInfoOverview.studyStudentCnt - }} + projectInfoOverview.studyStudentCnt + }}
学习人数
{{ - projectInfoOverview.completeStudentCnt - }} + projectInfoOverview.completeStudentCnt + }}
完成人数
{{ - projectInfoOverview.onlineCourseCnt - }}%
在线课程数
@@ -299,8 +299,8 @@
{{ - projectInfoOverview.offLineCourseCnt - }}%
面授课程数
@@ -308,8 +308,8 @@
{{ - projectInfoOverview.completeRatio - }}%
总完成率
@@ -324,13 +324,13 @@
-->
{{ item.stage }}
@@ -344,28 +344,28 @@
课程完成率
考试通过率
作业完成率
@@ -376,8 +376,8 @@
阶段任务总数
@@ -386,8 +386,8 @@
必修课
@@ -396,8 +396,8 @@
选修课
@@ -415,12 +415,12 @@ 批量面授报名 --> @@ -437,8 +437,8 @@
-->