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 01/12] =?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 460d9b92e71b2359f2031bbed560b4020ec163d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 24 Oct 2022 18:27:27 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE,=E5=8F=96=E6=B6=88=E6=8E=88?= =?UTF-8?q?=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/PowerList.vue | 114 +++++++++++++++++++++++- src/views/learningpath/LearningPath.vue | 21 +++-- src/views/learningpath/LevelAdd.vue | 90 +++++++++++++++++-- 3 files changed, 207 insertions(+), 18 deletions(-) diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue index 020b124e..2768f8d5 100644 --- a/src/components/drawers/PowerList.vue +++ b/src/components/drawers/PowerList.vue @@ -92,7 +92,7 @@ v-model:visible="cancelModal" :footer="null" :closable="closeCancel" - wrapClassName="CopyModal" + wrapClassName="copyModal" centered="true" >
@@ -104,7 +104,7 @@
- 是否取消当前用户对此数据的权限 + 您确定要取消该用户的授权吗
@@ -332,7 +332,117 @@ export default { padding: 0px; } } +.copyModal { + .ant-modal { + width: 424px !important; + height: 258px !important; + .ant-modal-content { + width: 424px !important; + height: 258px !important; + .ant-modal-body { + width: 424px !important; + height: 258px !important; + padding: 0 !important; + .delete { + z-index: 999; + width: 424px; + height: 258px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + border-radius: 4px; + // position: absolute; + // left: 50%; + // top: 10%; + // transform: translate(-50%, -50%); + .del_header { + position: absolute; + width: calc(100%); + height: 68px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } + .del_main { + width: 100%; + position: relative; + .header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/notice.png); + background-size: 100% 100%; + } + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } + .body { + width: 100%; + margin: 34px auto 56px auto; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + // background-color: red; + position: relative; + .back { + position: absolute; + top: 30px; + font-size: 12px; + font-weight: 400; + color: #666666; + } + } + .del_btnbox { + display: flex; + margin: 30px auto; + justify-content: center; + .del_btn { + width: 100px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn1 { + border: 1px solid rgba(64, 158, 255, 1); + color: #4ea6ff; + margin-right: 14px; + } + .btn2 { + background-color: #4ea6ff; + color: #ffffff; + } + } + } + } + } + } + } +} .powerList { // width: 80%; .ant-drawer-content-wrapper { diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index f02d9e9c..3bf927d1 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -40,14 +40,17 @@ :placeholder="[' 开始时间', ' 结束时间']" />
-
-
-
搜索
-
-
-
-
重置
+
+
+
+
搜索
+
+
+
+
重置
+
+
@@ -1475,7 +1478,7 @@ export default { .del_header { position: absolute; width: calc(100%); - height: 40px; + height: 68px; background: linear-gradient( rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100% @@ -1494,7 +1497,7 @@ export default { width: 16px; height: 16px; margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/QR.png); + background-image: url(@/assets/images/taskpage/gan.png); background-size: 100% 100%; } .close_exit { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index d1107707..45086513 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -258,7 +258,11 @@
关卡内容可见可学设置
-
编辑
+
编辑
+
+
取消
+
确定
+
@@ -270,9 +274,17 @@ /> 预览其他关卡
- 学员可预览第1关-第4关内容 +
+ 学员可预览第 + 1 + + 关-第4 + + 关内容 +
+
学习其他关卡
- 学员可预览第1关-第4关内容 +
+ 学员可预览第 + 1 + + 关-第4 + + 关内容 +

@@ -464,6 +483,10 @@ export default { AddSvisible: false, //添加学员抽屉 AddImpStuvisible: false, //导入学员抽屉 CheckStuvisible: false, //学员管理的查看抽屉 + twobtn: true, + number: true, + twobtnn: false, + inputbox: false, projectNameListt: [ { id: 1, @@ -544,6 +567,8 @@ export default { ], activeKey: ref("1"), value: ref(" "), + nubvalue: ref("1"), + nubvalue1: ref("4"), checked2: false, currentPage: 1, tableDataTotal: 100, @@ -799,6 +824,18 @@ export default { const showCheckStu = () => { state.CheckStuvisible = true; }; + const showbtn = () => { + state.twobtn = false; + state.twobtnn = true; + state.number = false; + state.inputbox = true; + } + const closebtn = () => { + state.twobtnn = false; + state.twobtn = true; + state.number = true; + state.inputbox = false; + } return { ...toRefs(state), selectProjectName, @@ -814,6 +851,8 @@ export default { showAddStu, showImpStu, showCheckStu, + showbtn, //设置-编辑 + closebtn, }; }, }; @@ -1708,6 +1747,28 @@ export default { 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; @@ -1730,6 +1791,21 @@ export default { .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 { From 93590e8d5e5be9331a3dbaa25017340c452da62f Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 24 Oct 2022 18:33:07 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat=EF=BC=9A=E6=A8=A1=E6=9D=BF=E5=BA=93?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=9B=E5=85=B3=E5=8D=A1=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/leveladd/edit.png | Bin 0 -> 410 bytes src/views/learningpath/LevelAddDetail.vue | 165 +++++++------------- src/views/projectcenter/TemplateLibrary.vue | 6 +- 3 files changed, 62 insertions(+), 109 deletions(-) create mode 100644 src/assets/images/leveladd/edit.png diff --git a/src/assets/images/leveladd/edit.png b/src/assets/images/leveladd/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..e319e324dc5f650105a482cb7eb0825a02335f3b GIT binary patch literal 410 zcmV;L0cHM)P)Px$R7pfZR5(wilD$d;Q4odCvG5HP3tzy_!crf=U3UW_f}K_h7AlE~f6-tf{$Pl~ zLeq$yV0Tw{t$h(IOAE0K=14X%*({q7$W)hm?|gI4%n$-qAX9KdV>>l>qEBb=&K zqi+h_TL|m444VK~06qae0=4?N5ghu$&v2QG&%ggy3fyA|Cjg#knWZQoL(5$Ea@0yD zikvm+utvi|sNj^ANwN_#<)^ZMasX~pC^W-DHxCqRL_4dF6gS;5>iG_+8+(iI@z*#}sNdv5mQ9MEoTjBN{gOU(^b literal 0 HcmV?d00001 diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index a05538e8..eb612369 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -9,17 +9,22 @@
-
-
{{ item.tit }}
+
+
+
说明
+
+
+
+
+
+
+
{{ item.name }}
-
- - -
+
@@ -238,19 +243,6 @@
-
- -
- 已选择 -
- 3 -
- 项 - 总数： - 5 - 条 -
-
- -
- -
@@ -1071,41 +1051,57 @@ export default { .item { width: 171px; height: 83px; - display: flex; - background: rgba(255, 182, 78, 0.1); + background: rgba(255, 182, 78,.1); border: 1px solid #ffb64e; opacity: 0.45; border-radius: 8px; - margin-bottom: 17px; + margin-bottom: 16px; align-items: center; - position: relative; - .itemle { - margin-left: 17px; - .tit { - color: black; - // color: red; - font-size: 14px; - margin-bottom: 8px; - font-weight: bold; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - width: 100px; + padding: 16px; + opacity: .5; + .items1{ + margin-bottom: 12px; + display: flex; + align-items: center; + .box_left{ + width:140px; + display: flex; + align-items: center; + .script{ + display: flex; + justify-content: center; + align-items: center; + width: 56px; + height: 24px; + background: #FFB64E; + border-radius: 6px; + margin-right: 12px; + white-space: nowrap; + } + .imgIcon{ + width: 14px; + height: 14px; + background-image: url(@/assets/images/leveladd/edit.png); + background-size: 100% 100%; + } } - .name { - font-size: 14px; - color: #878b92; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - width: 100px; + .box_right{ + .imgIcon{ + width: 14px; + height: 14px; + background-image: url(@/assets/images/leveladd/z1.png); + background-size: 100% 100%; + } } } - .itemri { - display: flex; - flex-direction: column; - position: absolute; - right: 16px; + .items2{ + .name{ + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-weight: bold; + } } } } @@ -1264,7 +1260,6 @@ export default { } } .boom { - position: relative; width: 100%; flex: 1; background-color: #fff; @@ -1329,40 +1324,8 @@ export default { } } } - .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; - } - .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-top: 21px; margin-bottom: 80px; .classify { margin-left: 10px !important; @@ -1388,16 +1351,6 @@ export default { > td { background: #f6f9fd; } - .pa { - left: 0; - width: 100%; - // height: 20px; - // background-color: red; - display: flex; - justify-content: center; - position: absolute; - bottom: 20px; - } } .notable { width: 100%; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index f2a349d2..a6ef6eb7 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -151,7 +151,7 @@ export default defineComponent({
-
查看
+
查看 |
@@ -164,11 +164,11 @@ export default defineComponent({ {value.status === "未发布" ? (
-
发布 |
+
发布|
-
查看
+
查看|
From c84a615a8812d0cd78c358b3f7a74b4bbd1c7f31 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 24 Oct 2022 19:13:45 +0800 Subject: [PATCH 04/12] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/NoticePub.vue | 34 ++++-- src/components/drawers/ProjectScore.vue | 153 ++++++++++++++++-------- 2 files changed, 131 insertions(+), 56 deletions(-) diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index 7effed3a..d36f32b6 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -1,11 +1,12 @@ @@ -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 07/12] =?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 @@ -
排行榜
From 4c5ad8824ffedd1c1896aac51500d173ed7bf29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 25 Oct 2022 12:02:25 +0800 Subject: [PATCH 08/12] =?UTF-8?q?feat:=E6=9F=A5=E7=9C=8B=E5=AD=A6=E5=91=98?= =?UTF-8?q?,=E6=9F=A5=E7=9C=8B=E6=9D=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/MemberList.vue | 4 +- src/components/drawers/QueryRight.vue | 6 +- src/components/drawers/SeeStu.vue | 515 ++++++++++++++++---------- src/components/drawers/StuAdd.vue | 11 +- src/views/projectcenter/TaskPage.vue | 10 +- 5 files changed, 335 insertions(+), 211 deletions(-) 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 078557c2..6e3db51f 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="{ @@ -2358,7 +2358,7 @@ export default { title: "姓名", dataIndex: "name", key: "name", - width: 50, + width: 30, align: "left", className: "h", // scopedSlots: { customRender: "action" }, //引入的插槽 @@ -2395,7 +2395,7 @@ export default { title: "部门", dataIndex: "bum", key: "bum", - width: 40, + width: 50, align: "center", className: "h", }, @@ -2403,7 +2403,7 @@ export default { title: "岗位", dataIndex: "gangw", key: "gangw", - width: 40, + width: 50, align: "center", className: "h", }, @@ -2411,7 +2411,7 @@ export default { title: "所属小组", dataIndex: "group", key: "group", - width: 40, + width: 50, align: "center", className: "h", }, From 4e0937050835d2633d54d11176563f9f06ab6e09 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 25 Oct 2022 12:11:44 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98=E7=9A=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E5=91=98=E5=92=8C=E5=AF=BC=E5=85=A5=E5=AD=A6?= =?UTF-8?q?=E5=91=98=E5=8A=9F=E8=83=BD=20=E5=AF=BC=E5=85=A5=E5=AD=A6?= =?UTF-8?q?=E5=91=98=E7=9A=84=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLevelImportStu.vue | 1 + src/components/drawers/ImportStu.vue | 1 + src/views/learningpath/LevelAddDetail.vue | 638 ++++++++++--------- 3 files changed, 331 insertions(+), 309 deletions(-) diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index fdf9464d..ce7767bb 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -143,6 +143,7 @@ export default { display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; // background-color: red; margin-bottom: 20px; .headerTitle { diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue index b1d7c751..a0a89d66 100644 --- a/src/components/drawers/ImportStu.vue +++ b/src/components/drawers/ImportStu.vue @@ -145,6 +145,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 9128a420..09a7a8d3 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -368,80 +368,80 @@
-
-
-
- - - - -
-
- -
- 已选择 -
- 3 -
- 项 - 列表选项总数： - 5 - 条 +
+
+
+ + + +
-
-
- -
- -
- -
-
-
-
-
- 无学员 -
-
- 请添加学员或导入学员 -
-
-
-
+
+ +
+ 已选择 +
+ 3 +
+ 项 + 列表选项总数： + 5 + 条
- +
+ +
+ +
+ +
+
+
+
+
+ 无学员 +
+
+ 请添加学员或导入学员 +
+
+
+
+
+
+ +
+
-
-
@@ -455,11 +455,17 @@
+ + + +