From 7ed5222366db9ede2c13fa80ac3c126aeb1e5cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Mon, 24 Oct 2022 16:13:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ChangeGroup.vue | 91 ++-- src/router/index.js | 2 +- src/views/learningpath/LearningPath.vue | 26 +- src/views/projectcenter/ProjectManage.vue | 515 +++++++++++++++------- 4 files changed, 422 insertions(+), 212 deletions(-) diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue index 6099646c..7c1c1839 100644 --- a/src/components/drawers/ChangeGroup.vue +++ b/src/components/drawers/ChangeGroup.vue @@ -16,15 +16,15 @@ />
-
将此学员移动到
-
- -
+
将此学员移动到
+
+ +
@@ -32,7 +32,6 @@
- - \ No newline at end of file + diff --git a/src/router/index.js b/src/router/index.js index f91aa145..74803f23 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ const routes = [ { path: '/', name: '首页', - redirect: routesConfig[0].path + redirect: '/learningpath' }, ...routesConfig ] diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 36cc7d77..73051406 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -408,7 +408,7 @@ import { reactive, toRefs, onMounted } from "vue"; import OwnerShip from "../../components/drawers/Ownership"; import PowerList from "../../components/drawers/PowerList"; - +import axios from "axios"; export default { name: "learningPath", components: { OwnerShip, PowerList }, @@ -656,8 +656,32 @@ export default { ]; return columns; }; + //获取学习路径列表 + const getLearnPath = () => { + let obj = { + beginTime: 0, + endTime: 0, + name: "", + pageNo: 0, + pageSize: 0, + status: 0, + }; + axios + .post("https://111.231.196.214:30001/admin/router/list", obj, { + headers: { + "Content-Type": "application/json;charset=UTF-8", + }, + }) + .then((res) => { + console.log("获取成功", res); + }) + .catch((err) => { + console.log("获取失败", err); + }); + }; onMounted(() => { // console.log("执行"); + getLearnPath(); }); const selectProjectName = (value, index) => { console.log("value", value, index); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 947cf3c7..bffcaf1a 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -80,13 +80,6 @@ total: tableDataTotal, onChange: (page, pageSize) => { currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) }, }" > @@ -110,24 +103,24 @@
@@ -589,7 +582,9 @@
是否结束项目 -
（项目结束后学员将无法继续学习，此操作不可逆）
+
+ （项目结束后学员将无法继续学习，此操作不可逆） +
@@ -1070,7 +1065,6 @@ export default { data.map((value) => { if (value.children) { //多层项目 - console.log("11"); value.operation = value.state === "草稿" ? (
@@ -1129,9 +1123,13 @@ export default { 基础信息 -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
@@ -1173,9 +1171,14 @@ export default {
- { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
) : value.state === "已结束" ? ( @@ -1215,12 +1218,22 @@ export default { - { - showCopyModal(); - }}>复制 - { - showDeleteModal(); - }}>删除 + { + showCopyModal(); + }} + > + 复制 + + { + showDeleteModal(); + }} + > + 删除 + ) : (
@@ -1278,14 +1291,22 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
@@ -1331,9 +1352,14 @@ export default { 创建班级 - { + { showCopyModal(); - }}>复制 + }} + > + 复制 + ) : item.state === "已结束" ? (
@@ -1372,12 +1398,22 @@ export default {
- { + { showCopyModal(); - }}>复制 - { - showDeleteModal(); - }}>删除 + }} + > + 复制 + + { + showDeleteModal(); + }} + > + 删除 + ) : (
@@ -1432,19 +1468,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1489,9 +1537,14 @@ export default { - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1557,12 +1622,22 @@ export default {
- { - showCopyModal(); - }}>复制 - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 + + { + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1623,9 +1706,14 @@ export default {
- { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1707,19 +1807,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1764,9 +1876,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1832,9 +1961,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1900,9 +2046,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1983,9 +2146,14 @@ export default { {value.state === "草稿" ? ( 发布 ) : ( - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 + )}
{value.state === "草稿" ? ( @@ -1996,23 +2164,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
{ - showDeleteModal(); - }} + showDeleteModal(); + }} > 删除
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -2026,23 +2202,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
{ - showStopModal(); - }} + showStopModal(); + }} > 结束
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
基础信息 @@ -2056,15 +2240,19 @@ export default { dropdownClassName="tabledropdown" > -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
{ - showDeleteModal(); - }} + showDeleteModal(); + }} > 删除
@@ -2082,6 +2270,7 @@ export default { } }); state.tableData = data; + console.log("tableData", state.tableData); }; getTableDate(); From fab982d8f354c9499f175ff76a0b696fd73666aa Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 25 Oct 2022 10:55:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98=20=E5=AD=A6?= =?UTF-8?q?=E5=91=98=E6=97=A0=E6=95=B0=E6=8D=AE=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E7=82=B9=E5=87=BB=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 4 +- src/views/learningpath/LevelAddDetail.vue | 623 ++++++++++++++++++++-- 2 files changed, 595 insertions(+), 32 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 242bf097..65fbc10d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -540,8 +540,8 @@
-
+
+
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index eb612369..cbed01bb 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -8,10 +8,18 @@
添加关卡
-
+
-
说明
+
+ 说明 +
@@ -76,7 +84,7 @@
-
+
@@ -286,7 +294,7 @@
确定
-
+
下一步
@@ -328,6 +336,125 @@
+
+
+
+
+
+ +
+
+
产品经理进阶路径
+
创建时间：2022-07-21 00:00
+
+
+
+
+ 学习模式： +
+ +
切换模式
+
+
+
+ +
+ +
返回
+
+ +
+
+
+
+
+
+
+
+ + + + +
+
+ +
+ 已选择 +
+ 3 +
+ 项 + 列表选项总数： + 5 + 条 +
+
+
+ +
+ +
+ +
+
+
+
+
+ 无学员 +
+
+ 请添加学员或导入学员 +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
上一步
+
+
+
保存
+
+
+
+
@@ -484,6 +611,80 @@ export default { checkedd: false, }, ], + tableData2: [ + { + key: 1, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 2, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 3, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 4, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡1", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 5, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡1", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 6, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 7, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + { + key: 8, + name: "张三", + com: "产研部", + gang: "产品经理", + cur: "关卡2", + jin: "2/10", + time: "2022-07-15 14:00", + }, + ], drawertableData: [ { key: 1, @@ -589,6 +790,8 @@ export default { value1: "", value2: "", selectedRowKeys: [], + isActive: false, + gqxy_hs: true, }); const showDrawer = () => { state.visible = true; @@ -719,6 +922,95 @@ export default { ]; return columns; }; + const tableDataFunc2 = () => { + const columns = [ + { + title: "姓名", + dataIndex: "name", + // width: "30%", + key: "name", + width: 60, + align: "left", + className: "classify", + + scopedSlots: { customRender: "action" }, //引入的插槽 + customRender: (text) => { + return ( +
+ {text.record.name} + + {/** +
+ + {text.record.lei} + +*/} +
+ ); + }, + }, + { + title: "部门", + dataIndex: "com", + // width: "30%", + key: "com", + width: 110, + align: "center", + className: "h", + }, + { + title: "岗位", + dataIndex: "gang", + key: "gang", + width: 110, + align: "center", + className: "h", + }, + { + title: "当前关卡", + dataIndex: "cur", + key: "cur", + width: 110, + align: "center", + className: "h", + }, + { + title: "进度", + dataIndex: "jin", + key: "jin", + width: 110, + align: "center", + className: "h", + }, + { + title: "开始时间", + dataIndex: "time", + key: "time", + width: 120, + align: "center", + className: "h", + }, + { + title: "操作", + className: "h", + dataIndex: "opacation", + key: "opacation", + width: 140, + align: "center", + scopedSlots: { customRender: "action" }, //引入的插槽 + customRender: () => { + return ( +
+
+ 删除 +
+
+ ); + }, + }, + ]; + return columns; + }; const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); @@ -744,9 +1036,16 @@ export default { document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; }); + const changebgc = () => { + state.isActive = !state.isActive; + }; + const gqxy_hShow = () => { + state.gqxy_hs = !state.gqxy_hs; + }; return { ...toRefs(state), tableDataFunc, + tableDataFunc2, showDrawer, closeDrawer, showModal, @@ -754,6 +1053,8 @@ export default { afterVisibleChange, drawercolumns, onSelectChange, + changebgc, + gqxy_hShow, }; }, }; @@ -983,17 +1284,10 @@ export default { width: 100%; display: flex; min-width: 933px; - // min-width: 1200px; - // overflow-x: hidden; - // min-width: 1400px; - // overflow: scroll; background-color: rgba(245, 247, 250, 1); .left { margin-right: 20px; width: 208px; - // height: 100%; - // flex: 1; - // height: 100%; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); display: flex; @@ -1005,18 +1299,14 @@ export default { font-size: 18px; color: #363636; } - - // flex-wrap: wrap; .btn { margin-top: 20px; - // padding: 0px 26px 0px 26px; height: 38px; background: #fff6e8; border-radius: 8px; display: flex; align-items: center; justify-content: center; - // margin-right: 14px; flex-shrink: 0; cursor: pointer; .search { @@ -1026,7 +1316,6 @@ export default { font-size: 14px; font-weight: 400; color: #ffb64e; - // line-height: 38px; margin-top: 4px; margin-left: 5px; } @@ -1047,46 +1336,47 @@ export default { width: 208px; display: flex; flex-direction: column; - align-items: center; // background-color: #bfa; + align-items: center; .item { width: 171px; height: 83px; - background: rgba(255, 182, 78,.1); + background: rgba(255, 182, 78, 0.1); border: 1px solid #ffb64e; opacity: 0.45; border-radius: 8px; margin-bottom: 16px; align-items: center; padding: 16px; - opacity: .5; - .items1{ + opacity: 0.5; + cursor: pointer; + .items1 { margin-bottom: 12px; display: flex; align-items: center; - .box_left{ - width:140px; + .box_left { + width: 140px; display: flex; align-items: center; - .script{ + .script { display: flex; justify-content: center; align-items: center; width: 56px; height: 24px; - background: #FFB64E; + background: #ffb64e; border-radius: 6px; margin-right: 12px; white-space: nowrap; } - .imgIcon{ + .imgIcon { width: 14px; height: 14px; background-image: url(@/assets/images/leveladd/edit.png); background-size: 100% 100%; } } - .box_right{ - .imgIcon{ + .box_right { + .imgIcon { width: 14px; height: 14px; background-image: url(@/assets/images/leveladd/z1.png); @@ -1094,8 +1384,8 @@ export default { } } } - .items2{ - .name{ + .items2 { + .name { width: 100px; overflow: hidden; text-overflow: ellipsis; @@ -1104,6 +1394,9 @@ export default { } } } + .active { + opacity: 1; + } } } } @@ -1219,7 +1512,6 @@ export default { width: 100%; // height: 130px; margin-top: 20px; - margin-bottom: 20px; background-color: #fff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); display: flex; @@ -1261,6 +1553,7 @@ export default { } .boom { width: 100%; + margin-top: 20px; flex: 1; background-color: #fff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); @@ -1352,6 +1645,276 @@ export default { background: #f6f9fd; } } + .xwid { + position: relative; + margin-top: 30px; + display: flex; + margin-bottom: 20px; + .xin { + width: 100%; + .xheadb { + display: flex; + .addx { + width: 130px; + height: 40px; + background: #4ea6ff; + border-radius: 8px; + color: #fff; + border: 0; + cursor: pointer; + margin-right: 20px; + } + .addd { + width: 130px; + height: 40px; + background: #fff; + border-radius: 8px; + border: 1px solid #4ea6ff; + color: #4ea6ff; + cursor: pointer; + margin-right: 20px; + } + .select { + .ant-select { + // + // border: 0 !important; + border-radius: 11px; + .ant-select-selector { + border: 1px solid #4ea6ff !important; + .ant-select-selection-placeholder { + padding-left: 15px; + color: #4ea6ff; + } + } + } + } + } + .talk { + margin-top: 24px; + margin-bottom: 11px; + width: 100%; + height: 50px; + background: #f5faff; + border: 1px solid #4ea6ff; + // opacity: 0.22; + display: flex; + align-items: center; + .im { + width: 14px; + height: 15px; + margin-left: 27px; + margin-top: -3px; + } + .xu { + height: 100%; + line-height: 50px; + margin-left: 13px; + .yi { + color: #4f5156; + font-size: 14px; + } + .zon { + color: #999ba3; + font-size: 14px; + margin-left: 34px; + } + .th { + color: #4ea6ff; + } + } + } + .tableBox { + margin-bottom: 80px; + + .classify { + margin-left: 11px !important; + padding-left: 9px !important; + } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 38px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + .pa { + left: 0; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: center; + position: absolute; + bottom: 0px; + } + } + } + } + .Gcon { + display: flex; + .pad { + height: 100%; + width: 40px; + } + .Gin { + // background-color: #bfa; + margin-top: 30px; + .headone { + // background-color: red; + display: flex; + text-align: center; + .box { + width: 4px; + height: 20px; + background-color: #4ea6ff; + border-radius: 2px; + } + .onetitle { + margin-left: 15px; + color: #333333; + font-size: 14px; + } + .oneedi { + margin-left: 15px; + color: #4ea6ff; + cursor: pointer; + } + .twobtn { + display: flex; + .btnone { + width: 42px; + height: 24px; + border: 1px solid rgba(64, 158, 255, 1); + border-radius: 4px; + color: rgba(64, 158, 255, 1); + margin-left: 20px; + cursor: pointer; + } + .btntwo { + width: 42px; + height: 24px; + border: 1px solid rgba(64, 158, 255, 1); + border-radius: 4px; + color: #ffffff; + margin-left: 20px; + background: #409eff; + cursor: pointer; + } + } + } + .onemain { + margin-top: 20px; + margin-left: 55px; + color: #6f6f6f; + font-size: 14px; + .checkcon { + position: relative; + .in { + position: absolute; + // margin-top: 10px; + left: 0; + top: 3px; + } + .yulan { + // color: yellow; + margin-left: 22px; + // display: inline-block; + } + .yulan2 { + margin-left: 22px; + } + .ant-input-number { + height: 24px; + width: 24px; + margin: 10px; + border-radius: 4px; + border: 1px solid #6d7584; + .ant-input-number-input { + width: 100%; + height: 100%; + font-size: 14px; + padding: 0; + color: #409eff; + text-align: center; + } + } + } + } + .twomain { + margin-left: 20px; + margin-top: 20px; + .ant-switch-checked { + background-color: #5dc988; + } + .info { + margin-left: 10px; + color: #6f6f6f; + font-size: 14px; + // margin-top: 10px; + } + .infor { + margin-left: 38px; + margin-top: 10px; + color: #c7cbd2; + font-size: 14px; + } + .chooseshow { + // background-color: red; + margin-left: 38px; + margin-top: 12px; + .fane { + color: #6f6f6f; + font-size: 14px; + } + } + .choo { + display: none; + } + .btm { + margin-left: 38px; + margin-top: 20px; + .bmo { + color: #6f6f6f; + font-size: 14px; + } + .bmt { + color: #c7cbd2; + font-size: 14px; + margin-top: 3px; + } + .chosecon { + display: flex; + margin-top: 6px; + margin-bottom: 20px; + .chose { + position: relative; + .inl { + position: absolute; + top: 2px; + } + .sh { + margin-left: 23px; + color: #6f6f6f; + } + } + } + } + } + } + } .notable { width: 100%; height: 100%; From 3c9b61fef67afc383325295da4a4639f8dc8018b Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 25 Oct 2022 11:43:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96=E8=AF=A6=E6=83=85=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectScore.vue | 3 --- src/components/drawers/StuScoreDetail.vue | 17 +++++------------ src/views/learningpath/LevelAddDetail.vue | 2 ++ src/views/projectcenter/TaskPage.vue | 1 - 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 5f34c350..14b77a9c 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -467,14 +467,11 @@ export default { .ant-table-tbody{ .pa { - // left: 0; margin-top: 15px; - width: 100%; // height: 20px; // background-color: red; display: flex; justify-content: center; - // position: absolute; // bottom: 20px; } } diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index a2ca9d54..fef6efa1 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -23,8 +23,6 @@ :columns="tablecolumns" :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" - - :scroll="{ x: 900, y: 560 }" @expand="expandTable" :pagination="false" @@ -218,16 +216,14 @@ overflow-x: scroll; display: flex; flex-direction: column; - .header { height: 73px; border-bottom: 1px solid #e8e8e8; display: flex; justify-content: space-between; align-items: center; - // background-color: red; margin-bottom: 20px; - + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; @@ -252,6 +248,7 @@ .tableBox { + padding-bottom: 100px; .ant-table-selection-column { padding: 0px !important; // padding-left: 45px !important; @@ -290,15 +287,11 @@ } } .pa { - // left: 0; - margin-top: 15px; + margin-top: 20px; width: 100%; - // height: 20px; - // background-color: red; + flex:1; display: flex; justify-content: center; - // position: absolute; - // bottom: 20px; } } } @@ -313,7 +306,7 @@ align-items: center; justify-content: center; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); - + background-color: #ffffff; .btn1 { width: 100px; height: 40px; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index cbed01bb..9128a420 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1228,6 +1228,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; @@ -1258,6 +1259,7 @@ export default { align-items: center; justify-content: center; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); + background-color: #ffffff; .btn1 { width: 100px; height: 40px; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 078557c2..f18d9e1c 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -794,7 +794,6 @@ -
排行榜