diff --git a/src/App.vue b/src/App.vue index 4afa9ca8..b7e3719f 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.17------------"); + console.log("版本0.9.18------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/index.js b/src/api/index.js index 21944ade..215b7666 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -57,6 +57,7 @@ export const getProjectDetail = (obj) => http.get('/admin/project/detail', {para export const releaseProject = (obj) => http.post('/admin/project/publish', obj) //获取项目学员 export const projectStudent = (obj) => http.post('/admin/project/studentList', obj) +export const projectStudentCount = (obj) => http.get('/admin/student/getStudentCount', {params: obj}) //撤回发布、结束 export const handleProject = (obj) => http.post('/admin/project/handle', obj) 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/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue index 22d89d06..07f391d6 100644 --- a/src/components/drawers/NoticeHis.vue +++ b/src/components/drawers/NoticeHis.vue @@ -12,9 +12,9 @@