diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 0f230fd6..2150344f 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -48,13 +48,11 @@ >
- - +
@@ -380,13 +378,33 @@
- - - +
@@ -395,141 +413,6 @@ import { reactive, toRefs, defineComponent, ref } from "vue"; import { PlusOutlined, LoadingOutlined } from "@ant-design/icons-vue"; import { message } from "ant-design-vue"; -const columns = [ - { - 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, - key: "operation", - fixed: "right", - align: "center", - }, -]; -const data = [ - { - key: "1", - num: 1, - name: "时间管理", - content: "领导力", - courseform: "线上", - project: "管理者进阶-腾飞班1", - stunum: "50", - grade: "5", - status: "未提交", - ynpub: "未发布", - creator: "管理员", - createtime: "2022-07-20 9:30", - pubtime: "2022-07-20 9:30", - ynuse: "启用", - kkty: false, - }, - { - key: "2", - num: 2, - name: "智能制造初级课程", - content: "专业力", - courseform: "线上", - project: "-", - stunum: "200", - grade: "5", - status: "待审核", - ynpub: "未发布", - creator: "管理员", - createtime: "2022-07-20 9:30", - pubtime: "2022-07-20 9:30", - ynuse: "启用", - kkty: true, - }, -]; function getBase64(img, callback) { const reader = new FileReader(); @@ -543,6 +426,285 @@ export default defineComponent({ }, setup() { + const state = reactive({ + tableData: [ + { + key: "1", + num: 1, + name: "时间管理", + content: "领导力", + courseform: "线上", + project: "管理者进阶-腾飞班1", + stunum: "50", + grade: "5", + status: "未提交", + ynpub: "未发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "启用", + kkty: false, + }, + { + key: "2", + num: 2, + name: "智能制造初级课程", + content: "专业力", + courseform: "线上", + project: "-", + stunum: "200", + grade: "5", + status: "待审核", + ynpub: "未发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "启用", + kkty: true, + }, + { + key: "3", + num: 3, + name: "产业必备技能", + content: "专业力", + courseform: "线上", + project: "-", + stunum: "200", + grade: "5", + status: "已审核", + ynpub: "已发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "启用", + kkty: true, + }, + { + key: "4", + num: 4, + name: "B11入模培训", + content: "专业力", + courseform: "线上", + project: "-", + stunum: "200", + grade: "5", + status: "审核未通过", + ynpub: "未发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "停用", + kkty: true, + }, + { + key: "5", + num: 5, + name: "入职培训", + content: "通用力", + courseform: "面授", + project: "-", + stunum: "5", + grade: "5", + status: "未提交", + ynpub: "未发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "启用", + kkty: true, + }, + { + key: "6", + num: 6, + name: "入职培训", + content: "通用力", + courseform: "面授", + project: "-", + stunum: "5", + grade: "6", + status: "已审核", + ynpub: "已发布", + creator: "管理员", + createtime: "2022-07-20 9:30", + pubtime: "2022-07-20 9:30", + ynuse: "启用", + kkty: true, + }, + ], + }); + const tableDataFunc = () => { + const columns = [ + { + 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: "opacation", + key: "operation", + fixed: "right", + align: "center", + scopedSlots: { customRender: "action" }, + customRender: (text) => { + // console.log(text); + return ( +
+
+ + 开课 + + + 停用 + + + 编辑 + + + 管理 + + + 复制 + + + 授权 +
+
+
+ + 更多 +
+
+
+
+
+ ); + }, + }, + ]; + return columns; + }; + const fileList = ref([]); const loading = ref(false); const imageUrl = ref(""); @@ -585,9 +747,11 @@ export default defineComponent({ }; return { + ...toRefs(state), fileList, loading, imageUrl, + tableDataFunc, handleChange, beforeUpload, }; @@ -647,7 +811,6 @@ export default defineComponent({ state.of_hs = true; } }; - const hideShow = () => { if (state.hideshow == false) { state.hideshow = true; @@ -655,7 +818,6 @@ export default defineComponent({ state.hideshow = false; } }; - const bs_hShow = () => { if (state.bs_hs == true) { state.bs_hs = false; @@ -670,8 +832,6 @@ export default defineComponent({ }; return { ...toRefs(state), - data, - columns, options1, options2, of_hShow, @@ -938,7 +1098,7 @@ export default defineComponent({ } .faceteach { - // display: none; + display: none; z-index: 1000; width: 1358px; min-width: 1000px; @@ -1090,6 +1250,53 @@ export default defineComponent({ .tableBox { margin: 20px 38px 30px; + .op_box { + display: flex; + justify-content: right; + .opacation { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + // line-height: 36px; + .activecls { + display: inline-block; + } + .errorCls { + display: none; + } + .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; + } + } + } } } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index c5053fbb..ab9a614a 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -134,7 +134,10 @@
+ >
+ +
@@ -143,14 +146,111 @@
关卡内容可见可学设置
编辑
-
fewfew
+
+
+ + 预览其他关卡
+
+ 学员可预览第1关-第4关内容 +
+
+ + 学习其他关卡
+
+ 学员可预览第1关-第4关内容 +
+ +
+
+
+
+
+
+
+
+
+
关卡晋级规则
+
+
+ + 启用关卡自动规则加入 +
+ 若开启“新建/编辑关卡-添加学员”支持设定自动加入规则,将于每日8点同步数据 +
+
+
选择范围
+
+ +
+
+ +
+
+
+
关卡学习方案展示设置
+
仅支持移动端
+
+
+ 列表展示 +
+
+ 路径展示 +
+
+
+
- -
eee
@@ -164,8 +264,53 @@ export default { methods: {}, setup() { const state = reactive({ + projectNameList: [ + { + id: 1, + value: "项目一", + label: "项目一", + }, + { + id: 2, + value: "项目二", + label: "项目二", + }, + { + id: 3, + value: "项目三", + label: "项目三", + }, + { + id: 4, + value: "项目四", + label: "项目四", + }, + ], + projectNameList2: [ + { + id: 1, + value: "项目一", + label: "项目一", + }, + { + id: 2, + value: "项目二", + label: "项目二", + }, + { + id: 3, + value: "项目三", + label: "项目三", + }, + { + id: 4, + value: "项目四", + label: "项目四", + }, + ], activeKey: ref("1"), value: ref(" "), + checked2: false, level: [ { id: 1, @@ -191,8 +336,16 @@ export default { }, ], }); + const selectProjectName = (value, index) => { + console.log("value", value, index); + }; + const selectProjectName2 = (value, index) => { + console.log("value", value, index); + }; return { ...toRefs(state), + selectProjectName, + selectProjectName2, }; }, }; @@ -571,8 +724,7 @@ export default { width: 40px; } .Gin { - background-color: #bfa; - + // background-color: #bfa; margin-top: 30px; .headone { // background-color: red; @@ -595,8 +747,86 @@ export default { } } .onemain { - margin-top: 30px; + margin-top: 20px; margin-left: 55px; + + color: #6f6f6f; + font-size: 14px; + .checkcon { + position: relative; + .in { + position: absolute; + // margin-top: 10px; + left: 0; + top: 5px; + } + .yulan { + // color: yellow; + margin-left: 22px; + // display: inline-block; + } + .yulan2 { + margin-left: 22px; + } + } + } + .twomain { + margin-left: 20px; + margin-top: 20px; + .info { + margin-left: 10px; + color: #6f6f6f; + font-size: 14px; + } + .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; + } + .select { + } + } + .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: 5px; + } + .sh { + margin-left: 23px; + color: #6f6f6f; + } + } + } + } } } } 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