diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 8256fea2..ff52a803 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -1001,7 +1001,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/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 08a6bc2d..746c63dc 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -304,6 +304,7 @@ export default { } } .contentMain { + padding-right: 12px; .main_items { display: flex; justify-content: space-between; diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index ca7183fe..d90561a3 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -48,7 +48,7 @@ -
+
-
组织：
-
- -
-
- - -
-
-
受众名称：
+
+
选择组织：
- + +
+
+
姓名：
+ +
+
+ +
@@ -134,8 +140,75 @@
重置
+
+ +
+ +
+
-
+ + +
+
+
+
选择受众：
+
+ +
+
+
+
+
姓名：
+ +
+
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+
@@ -169,9 +242,9 @@ showSizeChanger="true" showQuickJumper="true" hideOnSinglePage="true" - :pageSize="pageSize" - :current="currentPage" - :total="tableDataTotal" + :pageSize="pageSize2" + :current="currentPage2" + :total="tableDataTotal2" class="pagination" />
@@ -182,7 +255,11 @@
-
已选
+
+
已选
+
6
+
人
+
全部清除 @@ -194,7 +271,11 @@
- 李明 + 李大明 +
+
+
+ 李二明
@@ -202,15 +283,11 @@
- 李明 + 李大明
- 李明 -
-
-
- 李明 + 李二明
@@ -239,43 +316,116 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 50, - organizeList: [ + pageSize1: 10, + currentPage1: 1, + tableDataTotal1: 50, + pageSize2: 10, + currentPage2: 1, + tableDataTotal2: 50, + selectedRowKeys: [], + selectedRowKeys1: [], + selectedRowKeys2: [], + activeKey: "1", + value: [], //级联选择框 + choosevalue: null, //受众选择 + valueSelect: null, //树形选择 + name: "", + nameadd: "", + nameaddd: "", + treeData: [ { - id: 1, + title: "京东方", value: "京东方", - label: "京东方", children: [ { - id: 2, + title: "产研部", value: "产研部", - label: "产研部", children: [ { - id: 4, - value: "产品部门", - label: "产品部门", + title: "产品部", + value: "产品部", }, { - id: 5, - value: "研发部门", - label: "研发部门", + title: "研究部", + value: "研究部", }, ], }, { - id: 3, - value: "人力资源部", - label: "人力资源部", + title: "二级标题", + value: "二级标题", children: [ { - id: 6, + title: "三级标题", + value: "三级标题", + children: [ + { + title: "四级标题", + value: "四级标题", + children: [ + { + title: "五级标题", + value: "五级标题", + children: [ + { + title: "六级标题", + value: "六级标题", + children: [ + { + title: "七级标题", + value: "七级标题", + children: [ + { + title: "八级标题", + value: "八级标题", + children: [ + { + title: "九级标题", + value: "九级标题", + children: [ + { + title: "十级标题", + value: "十级标题", + children: [ + { + title: "十一级标题", + value: "十一级标题", + children: [ + { + title: "十二级标题", + value: "十二级标题", + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + { + title: "人力资源部", + value: "人力资源部", + children: [ + { + title: "人事部", value: "人事部", - label: "人事部", }, { - id: 7, + title: "行政部", value: "行政部", - label: "行政部", }, ], }, @@ -287,55 +437,64 @@ export default { key: 1, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 2, name: "小刘", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 3, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 4, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 5, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 6, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 7, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 8, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 9, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, ], tablecolumns: [ @@ -348,17 +507,25 @@ export default { className: "h", }, { - title: "部门", - dataIndex: "bum", - key: "bum", - width: 40, + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, align: "center", className: "h", }, { - title: "岗位", - dataIndex: "gangw", - key: "gangw", + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", width: 40, align: "center", className: "h", @@ -367,56 +534,71 @@ export default { tabledata1: [ { key: 1, - name: "学习受众", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 2, - name: "2", - time: "2022-10-31 23:12:00", - total: "2", - state: "已发布", - type: "普通受众", + name: "小刘", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 3, - name: "mask", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 4, - name: "学习受众", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 5, - name: "学业受众", - time: "2022-10-31 23:12:00", - total: "2", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 6, - name: "案例受众", - time: "2022-10-31 23:12:00", - total: "3", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 7, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 8, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 9, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, ], tablecolumns1: [ { - title: "受众名称", + title: "姓名", dataIndex: "name", key: "name", width: 30, @@ -424,68 +606,185 @@ export default { className: "h", }, { - title: "创建时间", - dataIndex: "time", - key: "time", - width: 40, + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, align: "center", className: "h", }, { - title: "人数", - dataIndex: "total", - key: "total", - width: 20, - align: "center", - className: "h", - }, - { - title: "状态", - dataIndex: "state", - key: "state", - width: 20, - align: "center", - className: "h", - }, - { - title: "类型", - dataIndex: "type", - key: "type", + title: "归属组织", + dataIndex: "guishu", + key: "guishu", width: 30, align: "center", className: "h", }, + { + title: "部门", + dataIndex: "bum", + key: "bum", + width: 40, + align: "center", + className: "h", + }, + ], + tabledata2: [ + { + key: 1, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 2, + name: "小刘", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 3, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 4, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 5, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 6, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 7, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 8, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 9, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + ], + tablecolumns2: [ + { + title: "姓名", + dataIndex: "name", + key: "name", + width: 30, + align: "left", + className: "h", + }, + { + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, + align: "center", + className: "h", + }, + { + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", + width: 40, + align: "center", + className: "h", + }, + ], + organizeList1: [ + { + value: "产品受众群体", + label: "产品受众群体", + }, + { + value: "人力资源hrbp", + label: "人力资源hrbp", + }, ], }); const closeDrawer = () => { + state.activeKey = "1"; ctx.emit("update:ownpowervisible", false); }; const afterVisibleChange = (bool) => { console.log("state", bool); }; + const onSelectChange = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + const onSelectChange1 = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + const onSelectChange2 = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; return { ...toRefs(state), afterVisibleChange, closeDrawer, + onSelectChange, + onSelectChange1, + onSelectChange2, // change, }; }, }; - \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5814c3cd..3d1a37e9 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1053,7 +1053,7 @@
@@ -1681,24 +1681,34 @@
- + -
+
-
+
+
提示
- 您确定要删除此课程吗 +
+ 您确定要删除此课程吗 +
+
+ 您确定要复制此课程吗 +
+
+ 您确定要停用此课程吗 +
@@ -1712,68 +1722,6 @@
- - -
-
-
-
-
- 提示 -
-
-
- 您确定要复制此课程吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- - - - -
-
-
-
-
- 提示 -
-
-
- 您确定要停用此课程吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- - @@ -2457,6 +2405,7 @@ export default defineComponent({ agreestudy_hs: false, rejectstudy_hs: false, delete_hs: false, + del_hs:false, copy_hs: false, nouse_hs: false, // 二维码标题状态 @@ -2549,6 +2498,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2723,6 +2673,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2756,6 +2707,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2803,6 +2755,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} style="margin-left:22px" > @@ -2857,6 +2810,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2873,6 +2827,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2889,6 +2844,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2962,6 +2918,7 @@ export default defineComponent({
{ state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -3039,7 +2996,11 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
删除
+
{ + state.delete_hs = true; + state.del_hs = true; + }}>删除
) : ( @@ -3066,6 +3027,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.nouse_hs = true; }} > @@ -3238,11 +3200,8 @@ export default defineComponent({ }; const delete_exit = () => { state.delete_hs = false; - }; - const copy_exit = () => { + state.del_hs = false; state.copy_hs = false; - }; - const nouse_exit = () => { state.nouse_hs = false; }; const onSelectChange = (selectedRowKeys) => { @@ -3304,8 +3263,6 @@ export default defineComponent({ agreestudy_exit, rejectstudy_exit, delete_exit, - copy_exit, - nouse_exit, onSelectChange, faceManageChange, openMessage, @@ -4792,8 +4749,6 @@ export default defineComponent({ .notable { width: 100%; height: 100%; - display: flex; - justify-content: center; .notablebox { width: 412px; height: 212px; @@ -4802,8 +4757,7 @@ export default defineComponent({ display: flex; justify-content: center; text-align: center; - margin-top: 77px; - margin-bottom: 109px; + margin:77px auto 109px auto; cursor: pointer; position: relative; .smallleft { @@ -4925,7 +4879,7 @@ export default defineComponent({ } } .studentsmanage { - z-index: 999; + z-index: 1000; min-width: 1000px; background: #ffffff; .stm_main { @@ -5235,18 +5189,18 @@ export default defineComponent({ padding-left: 26px; font-size: 16px; .del-icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/notice.png); - background-size: 100% 100%; - } - .icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/QR.png); - background-size: 100% 100%; + width: 16px; + height: 16px; + position: relative; + margin-right: 10px; + img{ + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; + background-size: 100% 100%; + } } .close_exit { position: absolute; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 11b9e130..a05538e8 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -85,46 +85,16 @@
- -
-
- -
发布
-
- - -
-
更多
-
-
-
复制
-
删除
+ 学习模式： +
+ +
切换模式
-
返回
 @@ -254,16 +224,19 @@
-
- +
+
+ 任务列表 +
+
+
+
移动到任务阶段
+
+
+
+
批量删除
+
+
@@ -306,6 +279,36 @@ />
+ +
+
+
+
+
+ 无任务 +
+
+ 请点击上方，创建任务 +
+
+
+
+
+
+ +
+
+
+
+
+
暂存
+
+
+
确定
+
+
+
下一步
+
@@ -392,40 +395,6 @@ export default { name: "LevelAddDetail", 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: "移动任务到关卡", - }, - ], level: [ { id: "1", @@ -636,16 +605,11 @@ export default { visible: false, modal: false, clos: false, + stm_hs: false, value1: "", value2: "", selectedRowKeys: [], }); - const selectProjectName = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName2 = (value, index) => { - console.log("value", value, index); - }; const showDrawer = () => { state.visible = true; }; @@ -802,8 +766,6 @@ export default { }); return { ...toRefs(state), - selectProjectName, - selectProjectName2, tableDataFunc, showDrawer, closeDrawer, @@ -1201,16 +1163,44 @@ export default { } .rightt { - // width: 500px; height: 100%; - // background-color: red; - // position: absolute; - // right: 0; display: flex; align-items: center; .select { - margin-right: 50px; - // margin-bottom: 20px; + display: flex; + align-items: center; + white-space: nowrap; + margin-right: 56px; + .inputbox { + display: flex; + align-items: center; + border: 1px solid #c7cbd2; + width: 238px; + height: 40px; + border-radius: 8px; + input { + border: none; + outline: none; + } + .bottonbox { + width: 100px; + height: 40px; + background: #409eff; + border-radius: 8px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + flex-shrink: 0; + .btnText { + font-size: 14px; + font-weight: 400; + color: #ffffff; + line-height: 36px; + margin-left: 5px; + } + } + } } .line { height: 60px; @@ -1218,27 +1208,6 @@ export default { background-color: #e8effa; margin-right: 18px; } - .img2 { - width: 42px; - height: 42px; - margin-right: 18px; - } - .pub { - color: #ffb64e; - font-size: 14px; - margin-top: 5px; - margin-right: 30px; - cursor: pointer; - white-space: nowrap; - } - @media screen and (max-width: 1050px) { - .pub { - margin-right: 10px; - } - .line { - margin-right: 10px; - } - } .return { color: #4ea6ff; font-size: 14px; @@ -1246,53 +1215,6 @@ export default { margin-right: 20px; white-space: nowrap; } - - .role { - display: flex; - align-items: center; - font-size: 16px; - font-weight: 400; - color: #333330; - line-height: 36px; - cursor: pointer; - position: relative; - margin-right: 20px; - .roleArrow { - width: 13px; - height: 7px; - margin-left: 8px; - background-image: url(../../assets/images/navtop/down.png); - background-size: 100%; - } - .roleItems { - width: 109px; - height: 90px; - padding-top: 10px; - background: #ffffff; - box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); - position: absolute; - top: 35px; - right: 0px; - text-align: center; - display: none; - z-index: 100; - } - .roleItem { - font-size: 14px; - font-weight: 400; - color: rgba(79, 81, 86, 1); - line-height: 36px; - } - .roleItem:hover { - color: #4ea6ff; - } - } - .role:hover .roleItems { - display: block; - } - .role:hover .roleArrow { - background-image: url(../../assets/images/navtop/up.png); - } } } } @@ -1353,8 +1275,59 @@ export default { width: 95%; // height: 100%; // background-color: #bfa; - .select { - margin-top: 30px; + .title { + display: flex; + align-items: center; + justify-content: space-between; + .tit_left { + font-size: 16px; + font-weight: 500; + color: #363636; + line-height: 36px; + margin-top: 30px; + } + .tit_right { + display: flex; + align-items: center; + margin-top: 30px; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + 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; + cursor: pointer; + white-space: nowrap; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + background-color: #409eff; + .btnText { + color: #ffffff; + } + } + .btn2 { + background-color: #ffffff; + .imgIcon { + width: 16px; + height: 16px; + background-image: url(@/assets/images/projectadd/delete.png); + background-size: 100%; + } + .btnText { + color: #409eff; + } + } + } } .talk { margin-top: 24px; @@ -1426,20 +1399,97 @@ export default { bottom: 20px; } } + .notable { + width: 100%; + height: 100%; + .notablebox { + width: 412px; + height: 212px; + background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%); + border-radius: 10px; + display: flex; + justify-content: center; + text-align: center; + margin: 77px auto 109px auto; + cursor: pointer; + position: relative; + .smallleft { + position: absolute; + top: 18px; + left: 0px; + width: 8px; + height: 21px; + border-radius: 0px 4px 4px 0px; + background-color: #ffb64e; + } + .smallright { + position: absolute; + bottom: 18px; + right: 0px; + width: 8px; + height: 21px; + border-radius: 4px 0px 0px 4px; + background-color: #ffb64e; + } + .boxbody { + .boximg { + width: 72px; + height: 72px; + margin: 32px auto 20px auto; + background-image: url(@/assets/images/coursewareManage/nostate.png); + background-size: 100% 100%; + } + .boxtitle { + margin-bottom: 4px; + } + } + } + } + } + } + .footbtn { + width: 100%; + flex: 1; + background-color: #fff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); + display: flex; + justify-content: end; + .btnbox { + display: flex; + margin-right: 36px; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + margin: 21px 0px 19px 14px; + cursor: pointer; + white-space: nowrap; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + background-color: #409eff; + .btnText { + color: #ffffff; + } + } + .btn2 { + background-color: #ffffff; + .btnText { + color: #409eff; + } + } } } - // .drawerbox { - // // margin: 20px 38px 30px; - // th.h { - // background-color: #eff4fc !important; - // } - - // .ant-table-tbody - // > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) - // > td { - // background: #f6f9fd; - // } - // } } .opat { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 826fc564..6debe957 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -766,14 +766,18 @@ export default { padding-left: 26px; font-size: 16px; .del-icon { - display: flex; - align-items: center; - margin-right: 10px; - // background-image: url(@/assets/images/coursewareManage/notice.png); - img{ - background-size: 100% 100%; width: 16px; height: 16px; + position: relative; + margin-right: 10px; + // background-image: url(@/assets/images/coursewareManage/notice.png); + img{ + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; + background-size: 100% 100%; } } .icon {