diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index a6068f6b..3e8dce2d 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -78,7 +78,6 @@ border: 1px solid #C7CBD2 !important; // 表格--------------------------------- .tableBox{ - .ant-table-row .ant-table-cell{ height: 48px ; font-size: 14px; @@ -148,4 +147,48 @@ border: 1px solid #C7CBD2 !important; display: none; } } -} \ No newline at end of file +} +// 表格--------------------------------- +//表格下拉框------------------------------------------- +.tableSelect { + margin-left: 21px; + display: inline-block; + .ant-select:not(.ant-select-customize-input) + .ant-select-selector + .ant-select-selection-search-input { + background-color: rgba(255, 255, 255, 0); + border: none; + } + .ant-select:not(.ant-select-customize-input) .ant-select-selector { + background-color: rgba(255, 255, 255, 0); + border: none; + } + .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { + padding: 0; + } + .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) + .ant-select-selector { + box-shadow: none; + } + .ant-select-arrow { + right: 0px; + color: rgba(0, 0, 0, 0.8); + font-size: 14px; + line-height: 36px; + // top: 17px; + top:14px; + } + .ant-select-selection-item { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + line-height: 36px; + } + .ant-select-single.ant-select-open .ant-select-selection-item{ + color: #4ea6ff; + } +} +.tabledropdown { + width: 100px !important; +} +//表格下拉框------------------------------------------- \ No newline at end of file diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index 7cd518d1..b8e05d2a 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -112,7 +112,7 @@ export default { } .roleItems { width: 109px; - height: 80px; + height: 90px; padding-top: 10px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -121,6 +121,7 @@ export default { right: 0px; text-align: center; display: none; + z-index: 100; } .roleItem { font-size: 14px; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index dda5704a..2150344f 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -49,10 +49,10 @@
+ v-model:value="value2" + separator="至" + :placeholder="[' 开始时间', ' 结束时间']" + />
@@ -410,9 +410,9 @@ - \ No newline at end of file + diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 320fb7f2..d88df7c3 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -67,11 +67,10 @@
+ > + +
@@ -145,26 +159,10 @@ const columns = [ }, { title: "操作", - dataIndex: "opacation", - key: "opacation", + dataIndex: "operation", + key: "operation", width: 300, align: "center", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: () => { - // console.log(text); - return ( -
- 编辑 - 授权 - 创建子项目 - - 更多 -
-
- -
- ); - }, }, ]; @@ -209,7 +207,7 @@ export default { time: "2022-07-20 14:00:03", children: [ { - key: 5, + key: "1-1", projectName: "管理者进阶5", manager: "黄华 刘俊", state: "草稿", @@ -217,14 +215,14 @@ export default { time: "2022-07-20 14:00:03", children: [ { - key: 7, + key: "1-1-1", projectName: "管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7", manager: "黄华 刘俊", state: "草稿", creater: "毛继禹", time: "2022-07-20 14:00:03", - }, + }, ], }, ], @@ -242,21 +240,21 @@ export default { key: 3, projectName: "管理者进阶3", manager: "黄华 刘俊", - state: "草稿", + state: "进行中", creater: "毛继禹", time: "2022-07-20 14:00:03", hasChildren: true, children: [ { - key: 35, + key: "3-1", projectName: "管理者进阶35", manager: "黄华 刘俊", - state: "草稿", + state: "已结束", creater: "毛继禹", time: "2022-07-20 14:00:03", }, { - key: 36, + key: "3-2", projectName: "管理者进阶36", manager: "黄华 刘俊", state: "草稿", @@ -277,17 +275,59 @@ export default { key: 4, projectName: "管理者进阶5", manager: "黄华 刘俊", - state: "草稿", + state: "已结束", creater: "毛继禹", time: "2022-07-20 14:00:03", + children: [ + { + key: "4-1", + projectName: "管理者进阶5", + manager: "黄华 刘俊", + state: "进行中", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "4-1-1", + projectName: + "管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7", + manager: "黄华 刘俊", + state: "草稿", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + }, + ], }, { - key: 4, - projectName: "管理者进阶", + key: 5, + projectName: "管理者进阶5", manager: "黄华 刘俊", - state: "草稿", + state: "已结束", creater: "毛继禹", time: "2022-07-20 14:00:03", + children: [ + { + key: "5-1", + projectName: "管理者进阶5", + manager: "黄华 刘俊", + state: "已结束", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "5-1-1", + projectName: + "管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7", + manager: "黄华 刘俊", + state: "进行中", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + }, + ], }, { key: 4, @@ -417,11 +457,869 @@ export default { // console.log("惦记了"); console.log("e", e, a); }; + + const getTableDate = () => { + state.tableData.map((value) => { + if (value.children) { + //多层项目 + console.log("11"); + value.operation = + value.state === "草稿" ? ( +
+ 编辑 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 创建子项目 +
+ + +
基础信息
+ + +
存为模板
+ + +
+
+ ) : value.state === "进行中" ? ( +
+ 查看 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 + +
+ ) : value.state === "已结束" ? ( +
+ 查看 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 + 删除 +
+ ) : null; + + value.children.map((item) => { + if (item.children) { + //多层子项目 + item.operation = + item.state === "草稿" ? ( +
+ 编辑 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 创建班级 +
+ + +
复制
+ + +
删除
+ + +
+
+ ) : item.state === "进行中" ? ( +
+ 查看 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ + 创建班级 + 复制 +
+ ) : item.state === "已结束" ? ( +
+ 查看 +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 + 删除 +
+ ) : null; + + item.children.map((a) => { + //班级 + a.operation = + a.state === "草稿" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 发布 +
+ + +
复制
+ + +
删除
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : a.state === "进行中" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 +
+ + +
撤回
+ + +
结束
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : a.state === "已结束" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 + 复制 +
+ + +
删除
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : a.state === "未开始" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 +
+ + +
结束
+ + +
撤回
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : null; + }); + } else { + //单层子项目 + item.operation = + item.state === "草稿" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 发布 +
+ + +
复制
+ + +
删除
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : item.state === "进行中" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 +
+ + +
撤回
+ + +
结束
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : item.state === "已结束" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 +
+ + +
删除
+ + +
结束
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : item.state === "未开始" ? ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ 复制 +
+ + +
撤回
+ + +
结束
+ + +
存为模板
+ + +
基础信息
+ + +
+
+ ) : null; + } + }); + } else { + //单层项目 + value.operation = ( +
+ +
+ + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+ + {value.state === "草稿" ? ( + 发布 + ) : ( + 复制 + )} +
+ {value.state === "草稿" ? ( + + +
复制
+ + +
{ + console.log("点击了"); + }} + > + 删除 +
+ + +
存为模板
+ + +
基础信息
+ + + ) : value.state === "进行中" ? ( + + +
存为模板
+ + +
{ + console.log("点击了"); + }} + > + 结束 +
+ + +
撤回
+ + +
基础信息
+ + + ) : value.state === "已结束" || value.state === "未开始" ? ( + + +
存为模板
+ + +
{ + console.log("点击了"); + }} + > + 删除 +
+ + +
基础信息
+ + + ) : null} +
+
+ ); + } + + return 0; + }); + return state.tableData; + }; + + const tableDataFunc = () => { + const columns = [ + { + title: "项目名称", + dataIndex: "projectName", + key: "projectName", + width: 180, + // align: "center", + ellipsis: true, + // scopedSlots: { customRender: "action" }, //引入的插槽 + // customRender: (text, record) => { + // console.log(text, record); + // return {text.text}; + // }, + }, + { + title: "项目经理", + dataIndex: "manager", + key: "manager", + width: 100, + align: "center", + }, + { + title: "状态", + dataIndex: "state", + // width: "30%", + key: "state", + width: 100, + align: "center", + }, + { + title: "创建人", + dataIndex: "creater", + // width: "30%", + key: "creater", + width: 100, + align: "center", + }, + { + title: "创建时间", + dataIndex: "time", + key: "time", + width: 180, + align: "center", + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 300, + align: "center", + }, + ]; + const data = getTableDate(); + return [columns, data]; + }; return { ...toRefs(state), columns, selectProjectName, expandTable, + getTableDate, + tableDataFunc, }; }, }; @@ -525,14 +1423,42 @@ export default { } .tableBox { margin: 20px 38px 30px; + .ant-table-thead > tr > th { + font-size: 14px; + font-weight: 400; + color: #999ba3; + line-height: 36px; + padding: 5px 16px; + background-color: #eff4fc; + } + .ant-table { + // overflow: visible; + // z-index: 99999; + } } - .opacation { + .operation { font-size: 14px; font-weight: 400; color: #4ea6ff; // line-height: 36px; + .operation1 { + margin-left: 21px; + width: 28px; + display: inline-block; + } + .operation3 { + margin-left: 21px; + width: 70px; + display: inline-block; + text-align: center; + } .more { + width: 50px; + display: inline-block; + margin-left: 21px; position: relative; + text-align: left; + // z-index: 99999; .moreArrow { width: 13px; height: 7px; @@ -544,7 +1470,7 @@ export default { } .moreItems { width: 80px; - height: 70px; + padding: 5px; display: none; background: #ffffff; box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); @@ -552,8 +1478,9 @@ export default { border: 0px solid #dcdcdc; position: absolute; left: 0px; - top: 18px; + top: 28px; z-index: 100; + text-align: center; } } .more:hover .moreArrow { diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index bbe46ff7..a36dde4c 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -1,16 +1,113 @@ - \ No newline at end of file