Compare commits

...

9 Commits

Author SHA1 Message Date
zouyf 4e478f487a Merge pull request 'zouyf_dev' (#265) from zouyf_dev into main
Reviewed-on: #265
2024-09-25 09:52:30 +08:00
“zouyf” 2a4b0281c2 Merge branch 'main' into zouyf_dev 2024-09-25 09:51:35 +08:00
“zouyf” b76a589672 增加菁优网样式 2024-09-25 09:51:09 +08:00
“zouyf” b6d9082e1b Merge branch 'main' into zouyf_dev 2024-09-24 16:54:09 +08:00
“zouyf” c957961a0b Merge branch 'main' into zouyf_dev 2024-09-24 16:24:22 +08:00
“zouyf” 26576ad086 Merge branch 'main' into zouyf_dev 2024-09-24 15:54:42 +08:00
“zouyf” d1ab430a6c Merge branch 'main' into zouyf_dev 2024-09-23 09:26:44 +08:00
“zouyf” 7f9afedef9 Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
2024-09-19 14:05:16 +08:00
“zouyf” 7dcfd487fc Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
2024-09-19 11:11:51 +08:00
1 changed files with 9 additions and 7 deletions

View File

@ -647,13 +647,15 @@ defineExpose({
}) })
</script> </script>
<style src="@/assets/styles/JYStyle.css"></style>
<style scoped lang="scss"> <style scoped lang="scss">
// :deep(.reserv-date-pick) { /*:deep(.reserv-date-pick) {
// width: 140px; width: 140px;
// } }
// :deep(.reserv-time-pick) { :deep(.reserv-time-pick) {
// width: 240px; width: 240px;
// } }*/
.clwk_dialog { .clwk_dialog {
.clwk_dialog_view { .clwk_dialog_view {
display: flex; display: flex;
@ -669,7 +671,7 @@ defineExpose({
.view_teachrting { .view_teachrting {
flex: 1; flex: 1;
height: 100%; height: 100%;
// overflow-y: auto; /*overflow-y: auto; */
overflow: hidden; overflow: hidden;
} }
} }