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/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index f4f20786..8625790d 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -2,7 +2,7 @@ - 分钟 + 分钟
@@ -142,24 +142,37 @@ 考勤设置:
-
签到
+
+
签到
+
开始前: - + 分钟
开始后: - + 分钟
-
签退
+
+
签退
+
结束前: - + 分钟(提前签退则记为早退) @@ -373,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; @@ -424,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/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/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/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 1c431256..84bd43ac 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1213,7 +1213,7 @@
-