From 8348c7bfe8358d07419e5248bae5b9fa4992b749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Wed, 12 Oct 2022 11:45:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 2786 +++++++++--------- src/views/projectcenter/ProjectManage.vue | 1 + 2 files changed, 1458 insertions(+), 1329 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 58fd3297..a0f82187 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -79,7 +79,8 @@ -
@@ -139,16 +140,20 @@ >⃰ 授课形式 - -
-
-
线上
-
-
-
面授
+ +
+
+
+ 线上
- +
+
+ 面授 +
+
+
+
@@ -158,8 +163,12 @@ 是否设置目录
-
是
-
否
+
+ 是 +
+
+ 否 +
@@ -184,7 +193,7 @@
新建面授课 -
+
课程信息
@@ -208,7 +217,7 @@
收起
@@ -388,7 +397,7 @@ :columns="columns5" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" - :scroll="{ x: 800 }" + :scroll="{ x: 1500 }" expandRowByClick="true" @expand="expandTable" :pagination="false" @@ -399,316 +408,338 @@
-
-
-
- 在线课程管理 -
-
-
-
课程：BMOT2021年职级晋升-安全管理（高级）
-
-
类型：
-
录播课
-
内容分类：
-
领导力
-
状态：
-
已审核
-
-
- - - 报名管理 - - - 学习记录 - - - 资源完成情况 - - -
-
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
-
-
搜索
-
-
-
-
- -
-
+
+
+
+ 在线课程管理 +
+
+
课程：BMOT2021年职级晋升-安全管理（高级）
+
+
类型：
+
录播课
+
内容分类：
+
领导力
+
状态：
+
已审核
+
+
+ + 报名管理 + 学习记录 + 资源完成情况 + +
+
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+
+
搜索
+
+
+
+
+ +
+
+
-
-
-
- 面授课程管理 -
-
-
-
课程：BMOT2021年职级晋升-安全管理（高级）
-
-
类型：
-
录播课
-
内容分类：
-
领导力
-
状态：
-
已审核
-
-
- - - 报名管理 - - - 学习记录 - - -
-
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
-
-
搜索
-
-
-
-
- - - -
-
+
+
+
+ 面授课程管理 +
+
+
课程：BMOT2021年职级晋升-安全管理（高级）
+
+
类型：
+
录播课
+
内容分类：
+
领导力
+
状态：
+
已审核
+
+
+ + 报名管理 + 学习记录 + +
+
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+
+
搜索
+
+
+
+
+ + + +
+
+
-
-
-
- 查看详情 -
-
-
- - -
-
-
取消
-
+
+
+
+ 查看详情 +
+
+ + +
+
+
取消
+
+
-
-
-
- 授权 -
-
-
- -
-
-
搜索
-
-
-
-
重置
-
-
-
-
-
已选择 1 项
-
列表选项总计：5条
-
-
- - - -
+
+
+
+ 授权 +
+
+ +
+
+
搜索
+
+
+
+
重置
+
+
+
+
+
+ 已选择 1 项 +
+
+ 列表选项总计：5条 +
+
+
+ + + +
+
-
-
-
- 开课 -
-
-
- - -
- -
-
-
-
搜索
-
-
-
-
重置
-
-
-
-
新建开课
-
-
-
- -
+
+
+
+ 开课 +
+
+ + +
+ +
+
+
+
搜索
+
+
+
+
重置
+
+
+
+
+ 新建开课 +
+
+
+
+ +
+
-
+
@@ -835,101 +866,124 @@ -
-
+
+
+
+
+
+ 学员管理 +
-
-
-
- 学员管理 -
-
-
-
XXX课程-第1期-20220726已开课 4.5
-
时间：2022-07-26 14：30-15：00
-
地点：核心能力大楼培训教室
-
授课教师：王雪han
-
-
- -
-
-
搜索
-
-
-
-
重置
-
-
-
-
- 添加学员 -
-
-
- 批量操作 -
-
-
-
-
-
-
批量录入成绩
-
批量结业
-
批量通过
-
批量拒绝
-
-
-
-
-
导出
-
- -
+
+
+ XXX课程-第1期-20220726已开课 4.5 +
+
+ 时间：2022-07-26 14：30-15：00 +
+
+ 地点：核心能力大楼培训教室 +
+
+ 授课教师：王雪han +
+
+
+ +
+
+
搜索
-
- +
+
+
重置
+
+
+ 添加学员 +
+
+
+ 批量操作 +
+
+
+
+
+ 批量录入成绩 +
+
+ 批量结业 +
+
+ 批量通过 +
+
+ 批量拒绝 +
+
+
+
+
+
导出
+
+
+
+
+ +
+
@@ -1108,168 +1162,195 @@ const columns4 = [ }, ]; const columns5 = [ - { - title: '序号', - width: 200, - dataIndex: 'num', - key: 'num', - align: "center", - }, { - title: '名称', - width: 200, - dataIndex: 'name', - key: 'name', - }, { - title: '内容分类', - width: 200, - dataIndex: 'content', - key: '1', - align: "center", - }, { - title: '课程形式', - width: 200, - dataIndex: 'courseform', - key: '2', - align: "center", - }, { - title: ' 所属项目', - width: 300, - dataIndex: 'project', - key: '3', - align: "center", - }, { - title: '学习人数', - width: 200, - dataIndex: 'stunum', - key: '4', - align: "center", - }, { - title: '评分', - width: 200, - dataIndex: 'grade', - key: '5', - align: "center", - }, { - title: '状态', - width: 200, - dataIndex: 'status', - key: '6', - align: "center", - }, { - title: '是否发布', - width: 200, - dataIndex: 'ynpub', - key: '7', - align: "center", - }, { - title: '创建人', - width: 200, - dataIndex: 'creator', - key: '8', - align: "center", - }, { - title: '创建时间', - width: 280, - dataIndex: 'createtime', - key: '9', - align: "center", - }, { - title: '上线时间', - width: 280, - dataIndex: 'pubtime', - key: '10', - align: "center", - }, { - title: '是否停用', - width: 200, - key: 'either', - dataIndex: 'ynuse', - align: "center", - }, { - title: '操作', - width: 400, - className: "h", - dataIndex: "operation", - key: 'operation', - fixed: 'right', - align: "center", - }, + { + title: "序号", + width: 100, + dataIndex: "num", + key: "num", + align: "center", + }, + { + title: "名称", + width: 200, + dataIndex: "name", + key: "name", + ellipsis: true, + align: "center", + }, + { + title: "内容分类", + width: 100, + dataIndex: "content", + key: "1", + align: "center", + }, + { + title: "课程形式", + width: 100, + dataIndex: "courseform", + key: "2", + align: "center", + }, + { + title: " 所属项目", + width: 200, + dataIndex: "project", + key: "3", + align: "center", + ellipsis: true, + }, + { + title: "学习人数", + width: 110, + dataIndex: "stunum", + key: "4", + align: "center", + }, + { + title: "评分", + width: 100, + dataIndex: "grade", + key: "5", + align: "center", + }, + { + title: "状态", + width: 100, + dataIndex: "status", + key: "6", + align: "center", + }, + { + title: "是否发布", + width: 100, + dataIndex: "ynpub", + key: "7", + align: "center", + }, + { + title: "创建人", + width: 100, + dataIndex: "creator", + key: "8", + align: "center", + }, + { + title: "创建时间", + width: 160, + dataIndex: "createtime", + key: "9", + align: "center", + }, + { + title: "上线时间", + width: 160, + dataIndex: "pubtime", + key: "10", + align: "center", + }, + { + title: "是否停用", + width: 100, + key: "either", + dataIndex: "ynuse", + align: "center", + }, + { + title: "操作", + width: 300, + className: "h", + dataIndex: "operation", + key: "operation", + fixed: "right", + align: "center", + }, ]; const columns6 = [ - { - title: '序号', - width: 200, - dataIndex: 'num', - key: 'num', - align: "center", - }, { - title: '姓名', - width: 200, - dataIndex: 'name', - key: 'name', - }, { - title: '工号', - width: 200, - dataIndex: 'number', - key: '1', - align: "center", - }, { - title: '部门', - width: 200, - dataIndex: 'department', - key: '2', - align: "center", - }, { - title: ' 岗位', - width: 300, - dataIndex: 'postion', - key: '3', - align: "center", - }, { - title: 'Band', - width: 200, - dataIndex: 'band', - key: '4', - align: "center", - }, { - title: '报名状态', - width: 200, - dataIndex: 'status', - key: '5', - align: "center", - }, { - title: '加入方式', - width: 200, - dataIndex: 'join', - key: '6', - align: "center", - }, { - title: '签到状态', - width: 200, - dataIndex: 'signstatus', - key: '7', - align: "center", - }, { - title: '评估状态', - width: 200, - dataIndex: 'evastatus', - key: '8', - align: "center", - }, { - title: '结业状态', - width: 280, - dataIndex: 'overstatus', - key: '9', - align: "center", - },{ - title: '操作', - width: 400, - className: "h", - dataIndex: "operation", - key: 'operation', - fixed: 'right', - align: "center", - }, + { + title: "序号", + width: 200, + dataIndex: "num", + key: "num", + align: "center", + }, + { + title: "姓名", + width: 200, + dataIndex: "name", + key: "name", + }, + { + title: "工号", + width: 200, + dataIndex: "number", + key: "1", + align: "center", + }, + { + title: "部门", + width: 200, + dataIndex: "department", + key: "2", + align: "center", + }, + { + title: " 岗位", + width: 300, + dataIndex: "postion", + key: "3", + align: "center", + }, + { + title: "Band", + width: 200, + dataIndex: "band", + key: "4", + align: "center", + }, + { + title: "报名状态", + width: 200, + dataIndex: "status", + key: "5", + align: "center", + }, + { + title: "加入方式", + width: 200, + dataIndex: "join", + key: "6", + align: "center", + }, + { + title: "签到状态", + width: 200, + dataIndex: "signstatus", + key: "7", + align: "center", + }, + { + title: "评估状态", + width: 200, + dataIndex: "evastatus", + key: "8", + align: "center", + }, + { + title: "结业状态", + width: 280, + dataIndex: "overstatus", + key: "9", + align: "center", + }, + { + title: "操作", + width: 400, + className: "h", + dataIndex: "operation", + key: "operation", + fixed: "right", + align: "center", + }, ]; export default defineComponent({ components: { @@ -1667,7 +1748,7 @@ export default defineComponent({ // key: 'operation', // fixed: 'right', // align: "center", - // scopedSlots: { customRender: "action" }, + // scopedSlots: { customRender: "action" }, // customRender: (text) => { // // console.log('111',text); // return ( @@ -1756,21 +1837,26 @@ export default defineComponent({
{value.status === "已审核" ? (
- -
-
开课
+
+
+ 开课 +
-
-
管理
+
+
+ 管理 +
-
-
复制
+
+
+ 复制 +
-
+
-
+
- -
-
开课
+
+
+ 开课 +
- -
-
撤回
+
+
+
+
+
-
-
+
+
+
撤回
+
) : (
)} {value.status === "未提交" ? (
- -
-
开课
+
+
+ 开课 +
-
-
编辑
+
+
+ 编辑 +
-
-
复制
+
+
+ 复制 +
) : ( @@ -1897,23 +1993,28 @@ export default defineComponent({ )} {value.status === "审核未通过" ? (
-
-
开课
+
+
+ 开课 +
-
-
编辑
+
+
+ 编辑 +
-
-
复制
+
+
+ 复制 +
-
-
+
-
+
删除
@@ -1966,13 +2067,13 @@ export default defineComponent({
{value.status === "待审核" ? (
-
+
通过
-
+
拒绝
-
+
删除
@@ -1981,7 +2082,7 @@ export default defineComponent({ )} {value.status === "已通过" ? (
-
+
删除
@@ -1990,7 +2091,7 @@ export default defineComponent({ )} {value.status === "已拒绝" ? (
-
+
删除
@@ -2076,14 +2177,14 @@ export default defineComponent({ of_hs: false, hideshow: true, bs_hs: true, - ft_hs:false, + ft_hs: false, om_1: false, - ftm_1:false, + ftm_1: false, om_ckxq: false, - gpm_hs:false, + gpm_hs: false, stm_hs: false, - cstm_hs:false, - sm_hs:false, + cstm_hs: false, + sm_hs: false, }); const of_hShow = () => { @@ -2102,10 +2203,10 @@ export default defineComponent({ } }; const bs_hShow = () => { - state.bs_hs = true; + state.bs_hs = true; }; const bs_unhShow = () => { - state.bs_hs = false; + state.bs_hs = false; }; const createft = () => { if (state.bs_hs == true) { @@ -2343,11 +2444,11 @@ export default defineComponent({ } .ofm_body { width: 90%; - .ofmb_header{ + .ofmb_header { display: flex; align-items: center; margin: 14px auto; - .sign{ + .sign { width: 7px; height: 7px; margin-left: 78px; @@ -2360,7 +2461,7 @@ export default defineComponent({ display: flex; align-items: center; justify-content: center; - margin-left:6px; + margin-left: 6px; } .b_header { display: flex; @@ -2384,7 +2485,7 @@ export default defineComponent({ display: flex; align-items: center; margin: 21px auto 14px 80px; - .bc_box{ + .bc_box { display: flex; .bc_boxl, .bc_boxr { @@ -2398,7 +2499,7 @@ export default defineComponent({ .bs_box { display: flex; align-items: center; - .bc_box{ + .bc_box { display: flex; } } @@ -2597,14 +2698,18 @@ export default defineComponent({ margin: 20px 38px 30px; .operation { display: flex; - justify-content: right; + // justify-content: right; .nSelect { display: flex; .nselect { display: flex; color: #4ea6ff; font-size: 14px; - .ops1,.ops2,.ops3,.ops4,.ops5{ + .ops1, + .ops2, + .ops3, + .ops4, + .ops5 { margin-left: 20px; } // .jc { @@ -2628,8 +2733,8 @@ export default defineComponent({ width: 85%; min-width: 1000px; // height: 537px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); position: absolute; left: 50%; top: 50%; @@ -2644,810 +2749,833 @@ export default defineComponent({ rgba(78, 166, 255, 0) 100% ); } - .om_main{ - width:calc(100%); - position: relative; - .omm_header{ + .om_main { + width: calc(100%); + position: relative; + .omm_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .pc_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/pc.png); + } + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } + .om_body { + width: calc(100% - 50px); + padding-left: 50px; + padding-top: 17px; + .b_title { + color: #4f5156; + font-weight: 500; + margin-bottom: 19px; + } + .b_sub { + display: flex; + margin-bottom: 10px; + .bs_type { + color: #999ba3; + } + .bs_left { + color: #999ba3; + margin-left: 35px; + } + .bs_right { + color: #4f5156; + } + } + .b_menu { + width: calc(100%); + } + .b_menunav { + display: flex; + margin-top: 20px; + margin-bottom: 20px; + .bm_select { + margin-right: 20px; + } + .bm_input { + margin-right: 20px; + } + .bm_btn { display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .pc_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/pc.png); - } - .close_exit{ - position: absolute; - right:42px; - cursor: pointer; - width: 20px; - height: 20px; - background-image: url(@/assets/images/coursewareManage/close.png); - background-size: 100% 100%; - } - } - .om_body{ - width:calc(100% - 50px); - padding-left: 50px; - padding-top: 17px; - .b_title{ - color: #4F5156; - font-weight: 500; - margin-bottom: 19px; - } - .b_sub{ - display: flex; - margin-bottom: 10px; - .bs_type{ - color: #999BA3; - } - .bs_left{ - color: #999BA3; - margin-left: 35px; - } - .bs_right{ - color: #4F5156; - } - } - .b_menu{ - width:calc(100%); - } - .b_menunav{ - display: flex; - margin-top: 20px; - margin-bottom: 20px; - .bm_select{ - margin-right: 20px; - } - .bm_input{ - margin-right: 20px; - } - .bm_btn { - display: flex; - // flex-wrap: wrap; - .btn { - padding: 0px 26px 0px 26px; - height: 40px; - background: rgba(64, 158, 255, 0); - border-radius: 8px; - border: 1px solid rgba(64, 158, 255, 1); - display: flex; - align-items: center; - justify-content: center; - margin-right: 14px; - flex-shrink: 0; - .search { - background-size: 100%; - } - .btnText { - font-size: 14px; - font-weight: 400; - color: rgba(64, 158, 255, 1); - line-height: 36px; - margin-left: 5px; - } - } - .btn1 { - .search { - width: 15px; - height: 17px; - background-image: url("@/assets/images/coursewareManage/search1.png"); - } - } - .btn1:hover { - background: rgba(64, 158, 255, 1); - .search { - background-image: url("@/assets/images/coursewareManage/search0.png"); - } - .btnText { - color: #ffffff; - } - } + // flex-wrap: wrap; + .btn { + padding: 0px 26px 0px 26px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + margin-right: 14px; + flex-shrink: 0; + .search { + background-size: 100%; + } + .btnText { + font-size: 14px; + font-weight: 400; + color: rgba(64, 158, 255, 1); + line-height: 36px; + margin-left: 5px; + } } + .btn1 { + .search { + width: 15px; + height: 17px; + background-image: url("@/assets/images/coursewareManage/search1.png"); + } } + .btn1:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("@/assets/images/coursewareManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + } } + } } } - .ftsturecord{ + .ftsturecord { z-index: 999; width: 80%; min-width: 1000px; // height: 274px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); position: absolute; left: 50%; top: 50%; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); overflow: auto; - .ftsr_header{ - position: absolute; - width:calc(100%); - height: 40px; - background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%); + .ftsr_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } - .ftsr_main{ - width:calc(100%); - position: relative; - .m_header{ - display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .det_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/detail.png); - background-size: 100% 100%; - } - .det_exit{ - position: absolute; - right:42px; - cursor: pointer; - width: 20px; - height: 20px; - background-image: url(@/assets/images/coursewareManage/close.png); - background-size: 100% 100%; - } + .ftsr_main { + width: calc(100%); + position: relative; + .m_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .det_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/detail.png); + background-size: 100% 100%; } - .ftsr_table{ - width: 90%; - margin:30px auto; - border: 1px solid #F0F4FE; - } - .ftsr_btn { - width: 100px; - height: 40px; - background: #ffffff; - border: 1px solid #4EA6FF; - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - margin: 30px auto ; - flex-shrink: 0; - cursor: pointer; - .btnText { - color: #4EA6FF; - font-size: 14px; - font-weight: 400; - line-height: 40px; - } + .det_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; } } - } - .givepower{ - z-index: 999; - width: 85%; - min-width: 1000px; - // height: 646px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%,-50%); - overflow: auto; - .gp_header{ - position: absolute; - width:calc(100%); - height: 40px; - background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%); - } - .gp_main{ - width:calc(100%); - position: relative; - .gpm_header{ - display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .givepower_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/givepower.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%; - } - } - .gpm_inputbtn{ - width: 90%; - margin: 20px auto; - display: flex; - .gpm_btn { - width: 100px; - height: 40px; - margin-right: 14px; - background: #ffffff; - border: 1px solid #4EA6FF; - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - cursor: pointer; - .btnText { - color: #4EA6FF; - font-size: 14px; - font-weight: 400; - line-height: 40px; - } - } - .btn1 { - .search { - width: 15px; - height: 17px; - margin-right: 6px; - background-image: url("../../assets/images/courseManage/search1.png"); - } - } - .btn2 { - .reset { - width: 16px; - height: 18px; - margin-right: 6px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - .btn1:hover { - background: #4EA6FF; - .search { - background-image: url("@/assets/images/coursewareManage/search0.png"); - } - .btnText { - color: #ffffff; - } - } - .btn2:hover { - background: #4EA6FF; - .reset { - background-image: url("@/assets/images/coursewareManage/reset0.png"); - } - .btnText { - color: #ffffff; - } - } - } - .gpm_notice{ - display: flex; - background: rgba(78,166,255,0.25); - border: 1px solid #4EA6FF; - width: 90%; - height: 62px; - margin:20px auto; - align-items: center; - line-height: 64px; - .th_icon{ - width: 16px; - height: 16px; - background-image: url(@/assets/images/coursewareManage/gan.png); - background-size: 100% 100%; - margin: auto 13px auto 37px; - } - .textarea{ - margin-right: 33px; - } - } - .gpm_table{ - width: 90%; - margin:30px auto; - border: 1px solid #F0F4FE; - } + .ftsr_table { + width: 90%; + margin: 30px auto; + border: 1px solid #f0f4fe; } - } - .schooltime{ - z-index: 999; - width: 85%; - min-width: 1000px; - // height: 646px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%,-50%); - overflow: auto; - .st_header{ - position: absolute; - width:calc(100%); + .ftsr_btn { + width: 100px; height: 40px; - background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%); - } - .st_main{ - width:calc(100%); - position: relative; - .stm_header{ - display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .scht_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/scht.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%; - } - } - .stm_inputbtn{ - display: flex; - width: 90%; - margin: 20px auto; - .stm_btn { - width: 100px; - height: 40px; - margin-right: 14px; - background: #ffffff; - border: 1px solid #4EA6FF; - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - cursor: pointer; - .btnText { - color: #4EA6FF; - font-size: 14px; - font-weight: 400; - line-height: 40px; - } - } - .btn1 { - .search { - width: 15px; - height: 17px; - margin-right: 6px; - background-image: url("@/assets/images/coursewareManage/search1.png"); - } - } - .btn2 { - .reset { - width: 16px; - height: 18px; - margin-right: 6px; - background-image: url("@/assets/images/coursewareManage/reset1.png"); - } - } - .btn1:hover { - background: #4EA6FF; - .search { - background-image: url("@/assets/images/coursewareManage/search0.png"); - } - .btnText { - color: #ffffff; - } - } - .btn2:hover { - background: #4EA6FF; - .reset { - background-image: url("@/assets/images/coursewareManage/reset0.png"); - } - .btnText { - color: #ffffff; - } - } - } - .stm_btn3{ - width: 130px; - height: 40px; - border: 1px solid #4EA6FF; - background-color: #4EA6FF; - 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; - } - .btn3 { - .add { - width: 17px; - height: 18px; - background-image: url("@/assets/images/coursewareManage/add0.png"); - background-size: 100% 100%; - margin-right: 6px; - } - } - } - - .stm_table{ - width: 90%; - margin:30px auto; - border: 1px solid #F0F4FE; - } - .opacation { + background: #ffffff; + border: 1px solid #4ea6ff; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + margin: 30px auto; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4ea6ff; font-size: 14px; font-weight: 400; - color: #4ea6ff; - // line-height: 36px; - .more { - position: relative; - .moreArrow { - width: 13px; - height: 7px; - display: inline-block; - background-image: url("../../assets/images/navtop/down.png"); - background-size: 100%; - margin: 2px; - margin-left: 7px; - } - .moreItems { - width: 80px; - height: 70px; - display: none; - background: #ffffff; - box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); - border-radius: 3px; - border: 0px solid #dcdcdc; - position: absolute; - left: 0px; - top: 18px; - z-index: 100; - } - } - .more:hover .moreArrow { - background-image: url("../../assets/images/navtop/up.png"); - } - .more:hover .moreItems { - display: block; - } + line-height: 40px; } } } - .createschooltime{ + } + .givepower { + z-index: 999; + width: 85%; + min-width: 1000px; + // height: 646px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + overflow: auto; + .gp_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } + .gp_main { + width: calc(100%); + position: relative; + .gpm_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .givepower_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/givepower.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%; + } + } + .gpm_inputbtn { + width: 90%; + margin: 20px auto; + display: flex; + .gpm_btn { + width: 100px; + height: 40px; + margin-right: 14px; + background: #ffffff; + border: 1px solid #4ea6ff; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4ea6ff; + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn1 { + .search { + width: 15px; + height: 17px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/search1.png"); + } + } + .btn2 { + .reset { + width: 16px; + height: 18px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn1:hover { + background: #4ea6ff; + .search { + background-image: url("@/assets/images/coursewareManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: #4ea6ff; + .reset { + background-image: url("@/assets/images/coursewareManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + } + .gpm_notice { + display: flex; + background: rgba(78, 166, 255, 0.25); + border: 1px solid #4ea6ff; + width: 90%; + height: 62px; + margin: 20px auto; + align-items: center; + line-height: 64px; + .th_icon { + width: 16px; + height: 16px; + background-image: url(@/assets/images/coursewareManage/gan.png); + background-size: 100% 100%; + margin: auto 13px auto 37px; + } + .textarea { + margin-right: 33px; + } + } + .gpm_table { + width: 90%; + margin: 30px auto; + border: 1px solid #f0f4fe; + } + } + } + .schooltime { + z-index: 999; + width: 85%; + min-width: 1000px; + // height: 646px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + overflow: auto; + .st_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } + .st_main { + width: calc(100%); + position: relative; + .stm_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .scht_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/scht.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%; + } + } + .stm_inputbtn { + display: flex; + width: 90%; + margin: 20px auto; + .stm_btn { + width: 100px; + height: 40px; + margin-right: 14px; + background: #ffffff; + border: 1px solid #4ea6ff; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4ea6ff; + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn1 { + .search { + width: 15px; + height: 17px; + margin-right: 6px; + background-image: url("@/assets/images/coursewareManage/search1.png"); + } + } + .btn2 { + .reset { + width: 16px; + height: 18px; + margin-right: 6px; + background-image: url("@/assets/images/coursewareManage/reset1.png"); + } + } + .btn1:hover { + background: #4ea6ff; + .search { + background-image: url("@/assets/images/coursewareManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: #4ea6ff; + .reset { + background-image: url("@/assets/images/coursewareManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + } + .stm_btn3 { + width: 130px; + height: 40px; + border: 1px solid #4ea6ff; + background-color: #4ea6ff; + 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; + } + .btn3 { + .add { + width: 17px; + height: 18px; + background-image: url("@/assets/images/coursewareManage/add0.png"); + background-size: 100% 100%; + margin-right: 6px; + } + } + } + + .stm_table { + width: 90%; + margin: 30px auto; + border: 1px solid #f0f4fe; + } + .opacation { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + // line-height: 36px; + .more { + position: relative; + .moreArrow { + width: 13px; + height: 7px; + display: inline-block; + background-image: url("../../assets/images/navtop/down.png"); + background-size: 100%; + margin: 2px; + margin-left: 7px; + } + .moreItems { + width: 80px; + height: 70px; + display: none; + background: #ffffff; + box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); + border-radius: 3px; + border: 0px solid #dcdcdc; + position: absolute; + left: 0px; + top: 18px; + z-index: 100; + } + } + .more:hover .moreArrow { + background-image: url("../../assets/images/navtop/up.png"); + } + .more:hover .moreItems { + display: block; + } + } + } + } + .createschooltime { z-index: 999; width: 679px; // height: 705px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); position: absolute; left: 50%; top: 50%; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); overflow: auto; - .cst_header{ - position: absolute; - width:calc(100%); - height: 40px; - background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%); + .cst_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } - .cst_main{ - width:calc(100%); - position: relative; - .cstm_header{ + .cst_main { + width: calc(100%); + position: relative; + .cstm_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .add_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/add1.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%; + } + } + .cstm_title { + margin: 10px auto 20px 51px; + font-weight: bold; + } + .cstm_items { + display: flex; + align-items: center; + margin-bottom: 23px; + } + .items1, + .items4 { + margin-left: 80px; + } + .items2 { + margin-left: 108px; + } + .items3, + .items5, + .items6, + .items7, + .items8 { + margin-left: 86px; + } + .items9 { + margin-left: 115px; + text-align: center; + margin-bottom: 0; + .items9box { + display: flex; + .upload_box { display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .add_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/add1.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%; + cursor: pointer; + .upload_icon { + width: 16px; + height: 16px; + background-image: url("@/assets/images/coursewareManage/enclosure.png"); + background-size: 100% 100%; + margin-right: 5px; } + } } - .cstm_title{ - margin: 10px auto 20px 51px; - font-weight: bold; - } - .cstm_items{ + } + .items10 { + display: flex; + justify-content: center; + margin-top: 20px; + margin-bottom: 20px; + .cstm_btn { + width: 100px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; display: flex; align-items: center; - margin-bottom: 23px; - } - .items1,.items4{ - margin-left: 80px; - } - .items2{ - margin-left: 108px; - } - .items3,.items5,.items6,.items7,.items8{ - margin-left: 86px; - } - .items9{ - margin-left: 115px; - text-align: center; - margin-bottom: 0; - .items9box{ - display: flex; - .upload_box{ - display: flex; - cursor: pointer; - .upload_icon{ - width: 16px; - height: 16px; - background-image: url('@/assets/images/coursewareManage/enclosure.png'); - background-size: 100% 100%; - margin-right: 5px; - } - } - } - } - .items10{ - display: flex; justify-content: center; - margin-top: 20px; - margin-bottom: 20px; - .cstm_btn{ - width: 100px; - height: 40px; - background: rgba(64, 158, 255, 0); - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - margin-right: 14px; - flex-shrink: 0; - cursor: pointer; - .btnText { - font-size: 14px; - font-weight: 400; - line-height: 40px; - } + margin-right: 14px; + flex-shrink: 0; + cursor: pointer; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; } - .btn5 { - border: 1px solid rgba(64, 158, 255, 1); - color: #4ea6ff; - } - .btn6 { - background-color: #4ea6ff; - color: #ffffff; - } - + } + .btn5 { + border: 1px solid rgba(64, 158, 255, 1); + color: #4ea6ff; + } + .btn6 { + background-color: #4ea6ff; + color: #ffffff; } } } - .studentsmanage{ + } + .studentsmanage { z-index: 999; width: 85%; min-width: 1000px; // height: 646px; - background: #FFFFFF; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); position: absolute; left: 50%; top: 50%; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); overflow: auto; - .stm_header{ - position: absolute; - width:calc(100%); - height: 40px; - background: linear-gradient( rgba(78,166,255,0.2) 0%, rgba(78,166,255,0) 100%); + .stm_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } - .stm_main{ - width:calc(100%); - position: relative; - .stmm_header{ - display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; - .stum_icon{ - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/stum.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%; - } + .stm_main { + width: calc(100%); + position: relative; + .stmm_header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .stum_icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/stum.png); + background-size: 100% 100%; } - .stmmitems{ - margin: auto 49px; - height: 400px; - overflow: auto; - .stmm_i1, - .stmm_i2, - .stmm_i3, - .stmm_i4{ - margin: 19px 0; - } - .stmm_i5{ + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } + .stmmitems { + margin: auto 49px; + height: 400px; + overflow: auto; + .stmm_i1, + .stmm_i2, + .stmm_i3, + .stmm_i4 { + margin: 19px 0; + } + .stmm_i5 { + display: flex; + justify-content: space-between; + .i5_left { display: flex; - justify-content: space-between; - .i5_left{ + .stmm_btn { + width: 100px; + height: 40px; + margin-right: 14px; + background: #ffffff; + border: 1px solid #4ea6ff; + border-radius: 8px; display: flex; - .stmm_btn { - width: 100px; - height: 40px; - margin-right: 14px; - background: #ffffff; - border: 1px solid #4EA6FF; - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - cursor: pointer; - .btnText { - color: #4EA6FF; - font-size: 14px; - font-weight: 400; - line-height: 40px; - } - } - .btn1 { - .search { - width: 15px; - height: 17px; - margin-right: 6px; - background-image: url("../../assets/images/courseManage/search1.png"); - } - } - .btn2 { - .reset { - width: 16px; - height: 18px; - margin-right: 6px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - .btn1:hover { - background: rgba(64, 158, 255, 1); - .search { - background-image: url("../../assets/images/courseManage/search0.png"); - } - .btnText { - color: #ffffff; - } - } - .btn2:hover { - background: rgba(64, 158, 255, 1); - .reset { - background-image: url("../../assets/images/courseManage/reset0.png"); - } - .btnText { - color: #ffffff; - } + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4ea6ff; + font-size: 14px; + font-weight: 400; + line-height: 40px; } } - .i5_right{ + .btn1 { + .search { + width: 15px; + height: 17px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/search1.png"); + } + } + .btn2 { + .reset { + width: 16px; + height: 18px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn1:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: rgba(64, 158, 255, 1); + .reset { + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + } + .i5_right { + display: flex; + .stmm_btn { + width: 100px; + height: 40px; + margin-right: 14px; + background: #ffffff; + border: 1px solid #4ea6ff; + border-radius: 8px; display: flex; - .stmm_btn { - width: 100px; - height: 40px; - margin-right: 14px; - background: #ffffff; - border: 1px solid #4EA6FF; - border-radius: 8px; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4ea6ff; + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn3 { + background-color: #4ea6ff; + } + .btn4 { + display: flex; + flex-direction: column; + position: relative; + .btn4_sub { display: flex; - align-items: center; justify-content: center; - flex-shrink: 0; - cursor: pointer; - .btnText { - color: #4EA6FF; - font-size: 14px; - font-weight: 400; - line-height: 40px; + align-items: center; + .b_zk { + width: 10px; + height: 8px; + background-image: url("@/assets/images/coursewareManage/down.png"); + background-size: 100% 100%; + } + .b_sq { + width: 10px; + height: 8px; + background-image: url("@/assets/images/coursewareManage/up.png"); + background-size: 100% 100%; } } - .btn3 { - background-color: #4EA6FF; - } - .btn4{ + .btn4_sup { + width: 100%; display: flex; flex-direction: column; - position: relative; - .btn4_sub{ - display: flex; - justify-content: center; - align-items: center; - .b_zk{ - width: 10px; - height: 8px; - background-image: url('@/assets/images/coursewareManage/down.png'); - background-size: 100% 100%; - } - .b_sq{ - width: 10px; - height: 8px; - background-image: url('@/assets/images/coursewareManage/up.png'); - background-size: 100% 100%; - } + background-color: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + position: absolute; + top: 40px; + z-index: 999; + .btn4_tit { + margin-top: 8px; + margin-left: 8px; } - .btn4_sup{ - width: 100%; - display: flex; - flex-direction: column; - background-color: #ffffff; - box-shadow: 0px 1px 35px 0px rgba(118,136,166,0.21); - position: absolute; - top: 40px; - z-index: 999; - .btn4_tit{ - margin-top:8px; - margin-left:8px; - } - .btn4_op1,.btn4_op2,.btn4_op3{ - margin-left: 20px; - } - } - } - .btn5 { - margin-right: 0px; - .export { - width: 17px; - height: 18px; - margin-right: 5px; - background-image: url("@/assets/images/coursewareManage/export.png"); - } - } - .btn5:hover { - background: #4EA6FF; - .export { - background-image: url("@/assets/images/coursewareManage/export1.png"); - } - .btnText { - color: #ffffff; + .btn4_op1, + .btn4_op2, + .btn4_op3 { + margin-left: 20px; } } } - } - .stmm_i6{ - margin-top:20px; - .operation,.nselect{ - display: flex; - justify-content: center; - color: #4EA6FF; - font-size: 14px; - .ops1,.ops2{ - margin-right: 10px; + .btn5 { + margin-right: 0px; + .export { + width: 17px; + height: 18px; + margin-right: 5px; + background-image: url("@/assets/images/coursewareManage/export.png"); } } + .btn5:hover { + background: #4ea6ff; + .export { + background-image: url("@/assets/images/coursewareManage/export1.png"); + } + .btnText { + color: #ffffff; + } + } + } + } + .stmm_i6 { + margin-top: 20px; + .operation, + .nselect { + display: flex; + justify-content: center; + color: #4ea6ff; + font-size: 14px; + .ops1, + .ops2 { + margin-right: 10px; + } } } } + } } } diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index f4173b9a..1da63768 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -163,6 +163,7 @@ const columns = [ key: "operation", width: 300, align: "center", + fixed: "right", }, ]; From 4973a0ff044ba1009e79544dedb812cad46efa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Wed, 12 Oct 2022 14:39:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86table=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 82e2d1e9..5a9da26d 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1966,7 +1966,7 @@ export default defineComponent({
-
+
撤回
@@ -2059,8 +2059,10 @@ export default defineComponent({
-
-
删除
+
+
+ 删除 +
) : ( From e36de76f555b4f08e114049c98bb46714d378974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Wed, 12 Oct 2022 16:15:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style:=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84tabs,=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/projectadd/open.png | Bin 0 -> 273 bytes src/views/projectcenter/TaskPage.vue | 40 ++++++++++++++++---------- src/views/research/ResearchManage.vue | 20 ++++++++----- 3 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 src/assets/images/projectadd/open.png diff --git a/src/assets/images/projectadd/open.png b/src/assets/images/projectadd/open.png new file mode 100644 index 0000000000000000000000000000000000000000..aab6f4d27d231c94e346fea759490a8f996e7371 GIT binary patch literal 273 zcmV+s0q*{ZP)Px#%Sl8*R47w@&M`~Fa1h4f-`fV;Q7B!N;?}7{!Kska>`v~D5d08b3WA@(C4np* zI&~~AhO8YOL`PjLPKsmVm4Cq?)q2}|_uO#;2vR#L3NEP8=Zix`6ZjCkVl3^2nMSF# z%92N*<(BqTDnGV9V)YMlqkH*N^El=Sqq7f7T*(cGiJciN{(=V24Ug^?y7Cjd0WNoN zi3qY#Sq0DMcJTH|4xD~tiOF54YnLnN!XUAB9d3ahBF@G{NcIc5hP%9e=OmBx@birg X1{pX^ab8;D00000NkvXXu0mjfr0H;; literal 0 HcmV?d00001 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f30e0755..914cd585 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -11,7 +11,7 @@
起止时间：2022-07-21 00:00至2020-10-21 00:00
-
+
结束项目 @@ -39,23 +39,23 @@
-
+
返回
-
+
-
+
- Content of Tab Pane 1 - - + :tabBarStyle="{ marginLeft: '10px',marginTop: '5px' }"> +
+ +
任务大纲
@@ -65,7 +65,7 @@
- + 阶段1腾飞班阶级1
@@ -333,21 +333,27 @@ } .content { //display: flex; - margin: 0 37px; + //margin: 0 37px; + .ant-tabs-nav-wrap { + margin-left: 30px; + } .onerow { - width: 100%; + //width: 100%; display: flex; height: 40px; position: relative; - //margin-top: 5xp; + margin-top: 15px; + margin-left: 38px; + //margin-right: 38px; .taskmain { font-size: 18px; + padding-top: 7px; color: #000000; } .btn { position: absolute; top: 0; - right: 110px; + right: 168px; background-color: #409EFF; width: 130px; height: 40px; @@ -358,7 +364,7 @@ } .edit { position: absolute; - right: 0; + right: 48px; top: 0; color: #409EFF; width: 100px; @@ -391,6 +397,8 @@ background-color: #EFF4FC; align-items: center; margin-top: 20px; + margin-left: 38px; + margin-right: 38px; .stageimg { margin-left: 31px; } @@ -402,11 +410,13 @@ } } .course { - width: 100%; + //width: 100%; display: flex; flex-wrap: wrap; align-items: center; padding: 10px; + margin-left: 38px; + margin-right: 38px; //margin: 0 12px; border: 1px solid #F2F6FC; .first { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 3b94a282..2f6b43e1 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -69,7 +69,9 @@ @expand="expandTable" :pagination="false" /> -
+ +
+
-
@@ -354,6 +355,7 @@ export default { height: 100%; display: flex; flex-direction: column; + //align-items: center; position: relative; // position: relative; .filter { @@ -451,6 +453,7 @@ export default { .tableBox { margin: 20px 38px 30px ; display: flex; + flex: 1; //position: relative; flex-direction: column; @@ -463,17 +466,20 @@ export default { > td { background: #f6f9fd; } - .pa { - left: 0; + + } + .pa { width: 100%; // height: 20px; // background-color: red; display: flex; justify-content: center; //position: absolute; - //bottom: 20px; + margin-bottom: 20px; + .pagination { + margin-bottom: 20px; + } } - } .out { display: block; position: absolute; @@ -540,7 +546,7 @@ export default { border-radius: 5px; // height: 120%; width: 100%; - height: 40px; + height: 30px; } } }