diff --git a/src/assets/images/studentimg/bgimg.png b/src/assets/images/studentimg/bgimg.png new file mode 100644 index 00000000..040c51cc Binary files /dev/null and b/src/assets/images/studentimg/bgimg.png differ diff --git a/src/assets/images/studentimg/chak.png b/src/assets/images/studentimg/chak.png new file mode 100644 index 00000000..d87fd7cd Binary files /dev/null and b/src/assets/images/studentimg/chak.png differ diff --git a/src/assets/images/studentimg/character.png b/src/assets/images/studentimg/character.png new file mode 100644 index 00000000..ff64ffd6 Binary files /dev/null and b/src/assets/images/studentimg/character.png differ diff --git a/src/assets/images/studentimg/close.png b/src/assets/images/studentimg/close.png new file mode 100644 index 00000000..6838766d Binary files /dev/null and b/src/assets/images/studentimg/close.png differ diff --git a/src/assets/images/studentimg/complete.png b/src/assets/images/studentimg/complete.png new file mode 100644 index 00000000..e8b14f68 Binary files /dev/null and b/src/assets/images/studentimg/complete.png differ diff --git a/src/assets/images/studentimg/notice.png b/src/assets/images/studentimg/notice.png new file mode 100644 index 00000000..1840f7f2 Binary files /dev/null and b/src/assets/images/studentimg/notice.png differ diff --git a/src/assets/images/studentimg/open.png b/src/assets/images/studentimg/open.png new file mode 100644 index 00000000..fe97a102 Binary files /dev/null and b/src/assets/images/studentimg/open.png differ diff --git a/src/assets/images/studentimg/xls.png b/src/assets/images/studentimg/xls.png new file mode 100644 index 00000000..0a86c92e Binary files /dev/null and b/src/assets/images/studentimg/xls.png differ diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 46152dc0..52d28c4a 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -266,6 +266,7 @@ textarea { //抽屉-------------------------------------------------------- .drawerStyle { + // transform: translateX(0px) !important; .ant-drawer-content-wrapper { max-width: 1050px; diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 6db40153..f81985a1 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -220,9 +220,11 @@ export default { gang: "产品经理", cur: "-", jin: "-", - time: "缺勤", state: "异常", + signIn: false, //签到 + signOut: false, //签退 + leave: false, //请假 }, { key: 2, @@ -231,8 +233,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "-", - time: "签到", + time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 3, @@ -241,8 +246,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "2022-10-31 23:12", - time: "签到/签退", - state: "正常", + time: "迟到", + state: "异常", + signIn: false, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 4, @@ -251,8 +259,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "2022-10-31 23:12", - time: "签到/签退", - state: "正常", + time: "早退", + state: "异常", + signIn: true, //签到 + signOut: false, //签退 + leave: false, //请假 }, { key: 5, @@ -263,6 +274,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 6, @@ -273,6 +287,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { name: "张三", @@ -282,6 +299,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 8, @@ -292,6 +312,9 @@ export default { jin: "2022-10-31 23:12", time: "请假", state: "正常", + signIn: false, //签到 + signOut: false, //签退 + leave: true, //请假 }, ], options: [ @@ -328,6 +351,43 @@ export default { state.selectedRowKeys = selectedRowKeys; }; + const getTableData = () => { + let arr = state.tableData; + arr.map((value) => { + // console.log("value", value); + value.opacation = ( +
+ { + console.log("点击签到", e); + }} + > + 签到 + + { + console.log("点击签退", e); + }} + > + 签退 + + { + console.log("点击请假", e); + }} + > + 请假 + +
+ ); + }); + state.tableData = arr; + }; + getTableData(); + const tableDataFunc = () => { const columns = [ { @@ -402,16 +462,16 @@ export default { className: "h", dataIndex: "opacation", key: "opacation", - width: 210, + width: 130, align: "center", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: () => { - return ( -
- -
- ); - }, + // scopedSlots: { customRender: "action" }, //引入的插槽 + // customRender: () => { + // return ( + //
+ // + //
+ // ); + // }, }, ]; return columns; @@ -429,7 +489,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index ce84b595..c0ea88cc 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -162,9 +162,9 @@
- 仅签到 - 签到、签退全部完成仅签到 + 签到、签退全部完成
@@ -220,15 +220,22 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addactiveVisible", false); + state.radioV1 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } return { ...toRefs(state), afterVisibleChange, closeDrawer, rowSelection, + cloradio1, }; }, }; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 9eec1733..8625790d 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -2,7 +2,7 @@ - 分钟 + 分钟
@@ -142,24 +142,37 @@ 考勤设置:
-
签到
+
+
签到
+
开始前: - + 分钟
开始后: - + 分钟
-
签退
+
+
签退
+
结束前: - + 分钟(提前签退则记为早退) @@ -173,8 +186,8 @@
- 仅签到 - 仅签到 + 签到、签退全部完成 @@ -196,8 +209,8 @@
- 允许项目内人员临时到场参加 - 允许项目内人员临时到场参加 + 允许项目外人员临时到场参加 @@ -309,6 +322,8 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); + state.radioV1 = ""; + state.radioV2 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); @@ -322,6 +337,16 @@ export default { const showDrawerAddTest = () => { state.addtestvisible = true; }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + }; + const cloradio2 = (value) => { + if (value != "") { + state.radioV2 = ""; + } + } return { ...toRefs(state), showDrawerSelFacet, @@ -330,6 +355,8 @@ export default { afterVisibleChange, closeDrawer, rowSelection, + cloradio1, + cloradio2, // change, }; }, @@ -359,6 +386,7 @@ export default { display: flex; justify-content: space-between; .main_left { + height: 1080px; padding-right: 30px; flex: 1; border-right: 1px solid #e8e8e8; @@ -410,7 +438,7 @@ export default { .qtbtn { width: 75px; height: 24px; - background: rgba(56,139,225,0.16); + background: rgba(56, 139, 225, 0.16); border-radius: 2px; border: 1px solid #387df7; display: flex; diff --git a/src/components/drawers/AddGroup.vue b/src/components/drawers/AddGroup.vue index d81ea841..6a419f89 100644 --- a/src/components/drawers/AddGroup.vue +++ b/src/components/drawers/AddGroup.vue @@ -16,38 +16,38 @@ />
-
-
- -
-
小组名称:
-
- -
+
+
+
-
-
- -
-
小组长:
-
- -
+
小组名称:
+
+
+
+
+
+ +
+
小组长:
+
+ +
+
@@ -55,7 +55,6 @@
- - \ No newline at end of file + diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 76485dc0..08f03cdb 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -230,8 +230,8 @@
- 仅签到 - 仅签到 + 签到、签退全部完成 @@ -439,6 +439,8 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); + state.radioV1 = ""; + state.playback = false; }; const afterVisibleChange = (bool) => { console.log("state", bool); @@ -446,6 +448,11 @@ export default { const PlayBack = () => { state.playback = !state.playback; }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } return { ...toRefs(state), afterVisibleChange, @@ -454,6 +461,7 @@ export default { options1, columns1, rowSelection, + cloradio1, }; }, }; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 4d879967..d2d7249c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -132,8 +132,8 @@
- 允许查看 - 允许查看 + 不允许查看 @@ -145,8 +145,8 @@
- 允许查看 - 允许查看 + 不允许查看 @@ -159,10 +159,10 @@
- 最高一次 - 最后一次 @@ -187,9 +187,9 @@
- 试题乱序 - 试题排序 - 全部乱序 + 试题乱序 + 试题排序 + 全部乱序
@@ -243,15 +243,43 @@ export default { }); const closeDrawer = () => { ctx.emit("update:addtestVisible", false); + state.radioV1 = ""; + state.radioV2 = ""; + state.radioV3 = ""; + state.radioV4 = ""; }; const afterVisibleChange = (bool) => { console.log("state", bool); }; + const cloradio1 = (value) => { + if (value != "") { + state.radioV1 = ""; + } + } + const cloradio2 = (value) => { + if (value != "") { + state.radioV2 = ""; + } + } + const cloradio3 = (value) => { + if (value != "") { + state.radioV3 = ""; + } + } + const cloradio4 = (value) => { + if (value != "") { + state.radioV4 = ""; + } + } return { ...toRefs(state), afterVisibleChange, closeDrawer, rowSelection, + cloradio1, + cloradio2, + cloradio3, + cloradio4, }; }, }; diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue new file mode 100644 index 00000000..34c4d1e7 --- /dev/null +++ b/src/components/drawers/CorPowerlist.vue @@ -0,0 +1,352 @@ + + + \ No newline at end of file diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue index c630893c..e72e2bcc 100644 --- a/src/components/drawers/FaceStu.vue +++ b/src/components/drawers/FaceStu.vue @@ -224,9 +224,11 @@ export default { gang: "产品经理", cur: "-", jin: "-", - time: "缺勤", state: "异常", + signIn: false, //签到 + signOut: false, //签退 + leave: false, //请假 }, { key: 2, @@ -235,8 +237,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "-", - time: "签到", + time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 3, @@ -245,8 +250,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "2022-10-31 23:12", - time: "签到/签退", - state: "正常", + time: "迟到", + state: "异常", + signIn: false, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 4, @@ -255,8 +263,11 @@ export default { gang: "产品经理", cur: "2022-10-31 23:12", jin: "2022-10-31 23:12", - time: "签到/签退", - state: "正常", + time: "早退", + state: "异常", + signIn: true, //签到 + signOut: false, //签退 + leave: false, //请假 }, { key: 5, @@ -267,6 +278,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 6, @@ -277,6 +291,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { name: "张三", @@ -286,6 +303,9 @@ export default { jin: "2022-10-31 23:12", time: "签到/签退", state: "正常", + signIn: true, //签到 + signOut: true, //签退 + leave: false, //请假 }, { key: 8, @@ -296,22 +316,26 @@ export default { jin: "2022-10-31 23:12", time: "请假", state: "正常", + signIn: false, //签到 + signOut: false, //签退 + leave: true, //请假 }, ], - options: [ + tableOptions: [ { - label: "Apple", - value: "Apple", + label: "签到", + value: "1", }, { - label: "Pear", - value: "Pear", + label: "签退", + value: "2", }, { - label: "Orange", - value: "Orange", + label: "请假", + value: "3", }, ], + // selectOption: [], }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -332,6 +356,42 @@ export default { state.selectedRowKeys = selectedRowKeys; }; + const getTableData = () => { + let arr = state.tableData; + arr.map((value) => { + // console.log("value", value); + value.opacation = ( +
+ { + console.log("点击签到", e); + }} + > + 签到 + + { + console.log("点击签退", e); + }} + > + 签退 + + { + console.log("点击请假", e); + }} + > + 请假 + +
+ ); + }); + state.tableData = arr; + }; + getTableData(); const tableDataFunc = () => { const columns = [ { @@ -406,16 +466,25 @@ export default { className: "h", dataIndex: "opacation", key: "opacation", - width: 210, + width: 130, align: "center", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: () => { - return ( -
- -
- ); - }, + // scopedSlots: { customRender: "action" }, //引入的插槽 + + // customRender: () => { + // return ( + //
+ // { + // console.log("eee", e); + // // state.selectOption = e; + // }} + // /> + //
+ // ); + // }, }, ]; return columns; @@ -428,12 +497,13 @@ export default { onSelectChange, showEntryScore, tableDataFunc, + getTableData, }; }, }; - \ No newline at end of file + diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue index e0bc373d..b1d7c751 100644 --- a/src/components/drawers/ImportStu.vue +++ b/src/components/drawers/ImportStu.vue @@ -33,7 +33,7 @@
-
+
京东方商业模型.xls
正在上传
@@ -48,7 +48,7 @@
上传失败
-
+
京东方商业模型.xls
上传失败
@@ -64,7 +64,7 @@
上传成功
-
+
京东方商业模型.xls
上传成功
@@ -221,12 +221,12 @@ export default { cursor: pointer; } .alimg { - width: 28px; - height: 32px; + width: 32px; + height: 34px; position: absolute; top: 66px; left: 24px; - background: green; + //background: green; } .upproject { position: absolute; diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue new file mode 100644 index 00000000..ca7183fe --- /dev/null +++ b/src/components/drawers/OwnPower.vue @@ -0,0 +1,776 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue index 6fe9cc3f..f0267f44 100644 --- a/src/components/drawers/Ownership.vue +++ b/src/components/drawers/Ownership.vue @@ -765,6 +765,7 @@ export default { background-image: url(../../assets/images/basicinfo/ch.png); right: -8px; top: -8px; + cursor: pointer; } } } diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue new file mode 100644 index 00000000..342d8572 --- /dev/null +++ b/src/components/drawers/ProMess.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue new file mode 100644 index 00000000..d79b413c --- /dev/null +++ b/src/components/drawers/SeeStu.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index e092a019..7f7cf7dc 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -98,7 +98,7 @@
受众名称:
@@ -168,12 +168,30 @@
-
李明
-
李大明
-
李二明
-
李明
-
李大明
-
李二明
+
+ 李明 +
+
+
+ 李大明 +
+
+
+ 李二明 +
+
+
+ 李明 +
+
+
+ 李大明 +
+
+
+ 李二明 +
+
@@ -448,20 +466,17 @@ export default { }; - \ No newline at end of file + diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index b7162605..7b4e5baf 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -79,9 +79,11 @@
- {{ value5.length }}/20 + {{ xzinputV1.length }}/20
@@ -181,16 +183,16 @@
-
+
- 线上
-
+
- 面授
@@ -212,10 +214,10 @@
- +
- +
@@ -243,6 +245,7 @@ :closable="false" wrapClassName="modalStyle facteachModal" width="80%" + @cancel="ft_exit" >
@@ -279,14 +282,14 @@
{{ value6.length }}/90{{ qdms_inputV1.length }}/90
@@ -367,14 +370,14 @@
{{ value7.length }}/50{{ qdms_inputV2.length }}/50
@@ -387,14 +390,14 @@
{{ value8.length }}/200{{ qdms_inputV3.length }}/200
@@ -446,7 +449,7 @@
@@ -471,7 +474,7 @@
@@ -485,14 +488,14 @@
{{ value11.length }}/150{{ qdms_inputV6.length }}/150
@@ -526,7 +529,7 @@
- 删除 +
删除
@@ -546,7 +549,7 @@
- 删除 +
删除
@@ -566,8 +569,8 @@
- 重传取消 +
重传
+
取消
@@ -581,11 +584,14 @@
正在上传
+
+ 50% +
- 暂停取消 +
暂停
+
取消
@@ -695,7 +701,7 @@ class="select" ref="select" placeholder="请选择状态" - v-model:value="value12" + v-model:value="gl_selectV1" style="width: 200px" @focus="focus" @change="handleChange" @@ -712,7 +718,7 @@
@@ -740,7 +746,7 @@ class="select" ref="select" placeholder="请选择状态" - v-model:value="value14" + v-model:value="gl_selectV2" style="width: 200px" @focus="focus" @change="handleChange" @@ -757,7 +763,7 @@
@@ -841,7 +847,7 @@ -
- + -->
@@ -971,7 +978,7 @@
+
-
无课程
-
请点击新建开课,创建课程
+
+ 无课程 +
+
+ 请点击新建开课,创建课程 +
-
+
-
+
- +
@@ -1108,13 +1125,13 @@
- {{ value20.length }}/50 + {{ xjkkinputV2.length }}/50
@@ -1131,7 +1148,7 @@
@@ -1149,7 +1166,7 @@
@@ -1170,13 +1187,13 @@ 签到设置
- - + 是否允许未报名的学员签到 - 签到是否需要口令 @@ -1197,18 +1214,18 @@ 完成规则
- - + 报名即完成 - 签到即完成 - 请假算完成 @@ -1261,6 +1278,7 @@ :closable="false" wrapClassName="modalStyle stusmanageModal" width="80%" + @cancel="sm_exit" >
@@ -1304,7 +1322,7 @@
- 二维码 +
+ 二维码 +
+
+ 在线课 +
+
+ 面授课 +
+
+ 面授课签到 +
+
+ 管理者面授课 +
@@ -1455,7 +1488,7 @@
结业
- +
- 结业
- 不结业
@@ -1619,7 +1652,7 @@
-
+
提示
@@ -1700,11 +1733,20 @@
+ + + + + +