diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 06eb35c1..a546f63d 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -71,7 +71,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 900, y: 560 }" + :scroll="{ x: 900 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -324,7 +324,7 @@ export default { height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow-y: auto; .endtime { font-size: 16px; font-weight: 500; diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue index b4484ffb..b7e26a90 100644 --- a/src/components/drawers/QueryRight.vue +++ b/src/components/drawers/QueryRight.vue @@ -69,7 +69,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500}" @expand="expandTable" :pagination="false" :row-selection="{ @@ -148,7 +148,7 @@ :data-source="tabledata1" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -229,7 +229,7 @@ :data-source="tabledata2" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index b0c37c85..024bca6b 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -17,109 +17,219 @@
-
-
-
王明
-
产研部门 - 产品经理
+
+ +
+
+
王明
+
产研部门 - 产品经理
+
+
+
进度排名
+
+ 2 + /10
-
-
进度排名
-
- 2 - /10 -
+
+ +
+
完成必修
+
+ 3 + /10
- -
-
完成必修
-
- 3 - /10 -
-
- -
-
已修证书
-
- 1 -
+
+ +
+
已修证书
+
+ 1
+
-
产品经理管理 - 腾飞班1
-
-
说明
-
-
+
产品经理管理 - 腾飞班1
+
+
说明
+
+
-
-
-
阶段1 腾飞班阶段1
+
+
+ +
+
阶段1 腾飞班阶段1
+
+
+
+
+
+
在线
+
如何成为一个产品经理
+
+
+
+ +
+
已完成
+
-
-
-
在线
-
如何成为一个产品经理
-
-
-
-
已完成
+
+
+
直播
+
管理者播课
+
+
+
+
+
已完成
+
-
-
-
直播
-
管理者播课
-
-
-
-
已完成
+
+
+
面授
+
管理面授课
+
+
+
+
+
未完成
+
-
-
-
面授
-
管理面授课
-
-
-
-
未完成
+
+
+
活动
+
管理者活动
+
+
+
+
+
未完成
+
-
-
-
活动
-
管理者活动
-
-
-
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
-
未完成
+
+
+
作业
+
管理者作业
+
+
+
+
+
未完成
+
+
-
-
-
-
阶段2 腾飞班阶段2
+
+
+
+
+
阶段2 腾飞班阶段2
+
+
+
+
+
+
在线
+
如何成为一个产品经理
+
+
+
+ +
+
已完成
+
+
+
+
+
+
直播
+
管理者播课
+
+
+
+ +
+
已完成
+
+
+
+
+
+
面授
+
管理面授课
+
+
+
+ +
+
未完成
+
+
+
+
+
+
活动
+
管理者活动
+
+
+
+ +
+
未完成
+
+
+
+
+
+
作业
+
管理者作业
+
+
+
+ +
+
未完成
+
+
+
-
@@ -144,6 +254,8 @@ export default { setup(props, ctx) { const state = reactive({ Provisible: false, + showDown: true, + showDown1: false, }); const closeDrawer = () => { ctx.emit("update:Seevisible", false); @@ -155,12 +267,19 @@ export default { const afterVisibleChange = (bool) => { console.log("state", bool); }; - + const changeDown = () => { + state.showDown = !state.showDown; + }; + const changeDown1 = () => { + state.showDown1 = !state.showDown1; + }; return { ...toRefs(state), afterVisibleChange, closeDrawer, showProMess, + changeDown, + changeDown1, // change, }; }, @@ -192,6 +311,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; @@ -201,144 +321,147 @@ export default { } } .main { - display: flex; - flex-direction: column; - .stuinfor { - display: flex; - align-items: center; - height: 133px; - margin-top: 20px; - margin-right: 37px; - background-image: url("../../assets/images/studentimg/bgimg.png"); - background-repeat: no-repeat; - background-position: right; - .stumation { - margin-left: 24px; - .stuname { - color: #333333; - font-size: 18px; - } - .stugangw { - color: #999999; - font-size: 16px; - margin-top: 7px; - } + display: flex; + flex-direction: column; + overflow-y: auto; + padding-bottom: 80px; + .stuinfor { + display: flex; + align-items: center; + height: 133px; + margin-top: 20px; + margin-right: 37px; + background-image: url("../../assets/images/studentimg/bgimg.png"); + background-repeat: no-repeat; + background-position: right; + .stumation { + margin-left: 24px; + .stuname { + color: #333333; + font-size: 18px; } - .sortbox { - display: flex; - flex-direction: column; - justify-content: center; - margin-left: 114px; - .sortname { - color: #666660; - font-size: 14px; - } - .sortnub { - display: flex; - justify-content: center; - margin-top: 7px; - .nub1 { - color: #0060FF; - font-size: 22px; - } - .total { - color: #999999; - font-size: 22px; - } - } - } - } - .secondrow { - margin-top: 32px; - display: flex; - .rowleft { - color: rgba(51, 51, 51, 1); + .stugangw { + color: #999999; font-size: 16px; - } - .rowbox { - width: 64px; - height: 24px; + margin-top: 7px; + } + } + .sortbox { + display: flex; + flex-direction: column; + justify-content: center; + margin-left: 114px; + .sortname { + color: #666660; + font-size: 14px; + } + .sortnub { display: flex; justify-content: center; - align-items: center; - margin-left: 24px; - border: 1px solid rgba(64, 158, 255, 1); - background: rgba(64, 158, 255, 0.1); - cursor: pointer; - .shuom { - color: rgba(64, 158, 255, 1); - font-size: 14px; - line-height: 20px; - margin-right: 5px; + margin-top: 7px; + .nub1 { + color: #0060ff; + font-size: 22px; } - } - } - .mainbox { - height: 463px; + .total { + color: #999999; + font-size: 22px; + } + } + } + } + .secondrow { + margin-top: 32px; + display: flex; + .rowleft { + color: rgba(51, 51, 51, 1); + font-size: 16px; + } + .rowbox { + width: 64px; + height: 24px; + display: flex; + justify-content: center; + align-items: center; + margin-left: 24px; + border: 1px solid rgba(64, 158, 255, 1); + background: rgba(64, 158, 255, 0.1); + cursor: pointer; + .shuom { + color: rgba(64, 158, 255, 1); + font-size: 14px; + line-height: 20px; + margin-right: 5px; + } + } + } + .mainbox { + // height: 463px; margin-right: 37px; margin-top: 32px; border: 1px solid rgba(221, 238, 255, 1); border-radius: 6px; .rowtitle { - height: 56px; - background: rgba(240, 246, 252, 1); - display: flex; - align-items: center; - .titleimg { - width: 20px; - height: 20px; - margin-left: 23px; - } - .titletext { - color: rgba(51, 51, 51, 1); - font-size: 16px; - font-weight: 500; - margin-left: 16px; - } + height: 56px; + background: rgba(240, 246, 252, 1); + display: flex; + align-items: center; + .titleimg { + width: 20px; + height: 20px; + margin-left: 23px; + } + .titletext { + color: rgba(51, 51, 51, 1); + font-size: 16px; + font-weight: 500; + margin-left: 16px; + } } .rowclass { - height: 81px; - border-bottom: 1px solid rgba(221, 238, 255, 1); + height: 81px; + border-bottom: 1px solid rgba(221, 238, 255, 1); + display: flex; + justify-content: space-between; + align-items: center; + .leftclass { display: flex; - justify-content: space-between; + margin-left: 25px; align-items: center; - .leftclass { - display: flex; - margin-left: 25px; - align-items: center; - .text1 { - color: #000000; - font-size: 14px; - font-weight: 500; - margin-left: 25px; - } - .text2 { - color: rgba(51, 51, 51, 0.8); - font-size: 14px; - margin-left: 65px; - } + .text1 { + color: #000000; + font-size: 14px; + font-weight: 500; + margin-left: 25px; } - .alreadyclass { - display: flex; - margin-right: 57px; - .alimg { - height: 16px; - width: 16px; - } - .altext { - color: rgba(56, 125, 247, 1); - font-size: 14px; - margin-left: 16px; - } + .text2 { + color: rgba(51, 51, 51, 0.8); + font-size: 14px; + margin-left: 65px; } + } + .alreadyclass { + display: flex; + margin-right: 57px; + .alimg { + height: 16px; + width: 16px; + } + .altext { + color: rgba(56, 125, 247, 1); + font-size: 14px; + margin-left: 16px; + } + } } - } + } } .btnn { height: 72px; width: 100%; position: absolute; bottom: 0; + background-color: #fff; left: 0; display: flex; align-items: center; diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index 01ae2c16..41c5d31b 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -72,7 +72,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -156,7 +156,7 @@ :data-source="tabledata1" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500}" @expand="expandTable" :pagination="false" :row-selection="{ @@ -246,7 +246,7 @@ :data-source="tabledata2" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -1073,7 +1073,7 @@ export default { } .main { display: flex; - // height: 80%; + //height: 80%; margin-bottom: 72px; overflow-y: auto; .left { @@ -1274,7 +1274,8 @@ export default { // bottom: 20px; .ant-pagination-item, .ant-pagination-prev, - .ant-pagination-next { + .ant-pagination-next, + .ant-pagination-options { margin-bottom: 10px; } } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f18d9e1c..45eb1d2a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -542,7 +542,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 1400, y: 350 }" + :scroll="{ x: 1400 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -2357,7 +2357,7 @@ export default { title: "姓名", dataIndex: "name", key: "name", - width: 50, + width: 30, align: "left", className: "h", // scopedSlots: { customRender: "action" }, //引入的插槽 @@ -2394,7 +2394,7 @@ export default { title: "部门", dataIndex: "bum", key: "bum", - width: 40, + width: 50, align: "center", className: "h", }, @@ -2402,7 +2402,7 @@ export default { title: "岗位", dataIndex: "gangw", key: "gangw", - width: 40, + width: 50, align: "center", className: "h", }, @@ -2410,7 +2410,7 @@ export default { title: "所属小组", dataIndex: "group", key: "group", - width: 40, + width: 50, align: "center", className: "h", },