From 30686dab0365953563cc92e2fb60725dda2b9fa6 Mon Sep 17 00:00:00 2001 From: wangxinbo Date: Sun, 15 Nov 2020 16:47:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 1 + ruoyi-ui/src/assets/styles/element-ui.scss | 192 +++++---- ruoyi-ui/src/assets/styles/index.scss | 21 +- ruoyi-ui/src/assets/styles/ruoyi.scss | 398 ++++++++--------- ruoyi-ui/src/components/Pagination/index.vue | 198 +++++---- ruoyi-ui/src/views/benyi/activity/index.vue | 17 +- .../src/views/benyi/calendarshow/index.vue | 13 + .../src/views/benyi/checkindetail/index.vue | 157 ++++--- .../benyi/checkinstatisticsschool/index.vue | 18 +- ruoyi-ui/src/views/benyi/child/index.vue | 214 +++++----- .../src/views/benyi/contactpeople/index.vue | 203 +++++---- ruoyi-ui/src/views/benyi/dayflow/task.vue | 133 ++++-- ruoyi-ui/src/views/benyi/experience/index.vue | 144 +++---- .../src/views/benyi/halfdayplan/index.vue | 129 +++--- .../src/views/benyi/healthcheck/index.vue | 119 +++--- .../benyi/learndevelopmentfamily/index.vue | 185 +++++--- .../benyi/learndevelopmentteacher/index.vue | 172 +++++--- .../benyi/mathtermplanapproval/index.vue | 127 +++--- .../benyi/recruitstudentsnotice/index.vue | 127 +++--- .../src/views/benyi/schoolcalendar/index.vue | 189 +++++--- .../benyi/thememonthplanapproval/index.vue | 194 ++++++--- .../benyi/themetermplanapproval/index.vue | 195 ++++++--- .../benyi/themeweekplanapproval/index.vue | 185 +++++--- .../src/views/benyi_train/lecturer/index.vue | 141 +++--- .../src/views/benyi_train/video/index.vue | 161 ++++--- .../views/benyi_train/video_study/detail.vue | 36 +- .../views/benyi_train/video_study/index.vue | 5 +- ruoyi-ui/src/views/index.vue | 27 +- ruoyi-ui/src/views/system/class/index.vue | 169 +++++--- ruoyi-ui/src/views/system/teacher/index.vue | 169 +++++--- ruoyi-ui/src/views/system/user/index.vue | 402 ++++++++++-------- .../src/views/system/user/profile/index.vue | 182 ++++---- ruoyi-ui/vue.config.js | 4 +- 33 files changed, 2803 insertions(+), 1824 deletions(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index f5941faef..a98161d6f 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -101,6 +101,7 @@ "husky": "1.3.1", "lint-staged": "8.1.5", "mockjs": "1.0.1-beta3", + "mux.js": "^5.6.7", "plop": "2.3.0", "runjs": "^4.3.2", "sass-loader": "^7.1.0", diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss index 558eea484..a7f5bdf6d 100644 --- a/ruoyi-ui/src/assets/styles/element-ui.scss +++ b/ruoyi-ui/src/assets/styles/element-ui.scss @@ -1,84 +1,108 @@ -// cover some element-ui styles - -.el-breadcrumb__inner, -.el-breadcrumb__inner a { - font-weight: 400 !important; -} - -.el-upload { - input[type="file"] { - display: none !important; - } -} - -.el-upload__input { - display: none; -} - -.cell { - .el-tag { - margin-right: 0px; - } -} - -.small-padding { - .cell { - padding-left: 5px; - padding-right: 5px; - } -} - -.fixed-width { - .el-button--mini { - padding: 7px 10px; - width: 60px; - } -} - -.status-col { - .cell { - padding: 0 10px; - text-align: center; - - .el-tag { - margin-right: 0px; - } - } -} - -// to fixed https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; -} - -// refine element ui upload -.upload-container { - .el-upload { - width: 100%; - - .el-upload-dragger { - width: 100%; - height: 200px; - } - } -} - -// dropdown -.el-dropdown-menu { - a { - display: block - } -} - -// fix date-picker ui bug in filter-item -.el-range-editor.el-input__inner { - display: inline-flex !important; -} - -// to fix el-date-picker css style -.el-range-separator { - box-sizing: content-box; -} +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + +.cell { + .el-tag { + margin-right: 0px; + } +} + +.small-padding { + .cell { + padding-left: 5px; + padding-right: 5px; + } +} + +.fixed-width { + .el-button--mini { + padding: 7px 10px; + width: 60px; + } +} + +.status-col { + .cell { + padding: 0 10px; + text-align: center; + + .el-tag { + margin-right: 0px; + } + } +} + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// fix date-picker ui bug in filter-item +.el-range-editor.el-input__inner { + display: inline-flex !important; +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} +.v-dialog .el-dialog { + width: 500px; +} +.big-dialog .el-dialog { + width: 800px; +} + +@media (max-width: 768.98px) { + .v-dialog .el-dialog, .big-dialog .el-dialog { + width: 96%; + .el-dialog__body { + max-height: 68vh; + overflow-y: auto; + } + } + .el-card { + .el-card__body { + padding: 10px; + } + } + .el-form-item { + margin-bottom: 10px; + } +} diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss index ce1738226..0f4846f48 100644 --- a/ruoyi-ui/src/assets/styles/index.scss +++ b/ruoyi-ui/src/assets/styles/index.scss @@ -122,6 +122,9 @@ aside { //main-container全局样式 .app-container { padding: 20px; + @media (max-width: 768.98px) { + padding: 10px; + } } .components-container { @@ -230,4 +233,20 @@ p { ul, li { list-style: none; -} \ No newline at end of file +} + +@media (max-width: 768.98px) { + .btn-list { + .el-button--mini { + padding: 4px 7px; + margin-bottom: 5px; + margin-left: 5px; + &:nth-of-type(1) { + margin-left: 0; + } + &:nth-of-type(5) { + margin-left: 0; + } + } + } +} diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 42d90a602..0806eae43 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -1,197 +1,201 @@ - /** - * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi - */ - - /** 基础通用 **/ -.pt5 { - padding-top: 5px; -} -.pr5 { - padding-right: 5px; -} -.pb5 { - padding-bottom: 5px; -} -.mt5 { - margin-top: 5px; -} -.mr5 { - margin-right: 5px; -} -.mb5 { - margin-bottom: 5px; -} -.mb8 { - margin-bottom: 8px; -} -.ml5 { - margin-left: 5px; -} -.mt10 { - margin-top: 10px; -} -.mr10 { - margin-right: 10px; -} -.mb10 { - margin-bottom: 10px; -} -.ml0 { - margin-left: 10px; -} -.mt20 { - margin-top: 20px; -} -.mr20 { - margin-right: 20px; -} -.mb20 { - margin-bottom: 20px; -} -.m20 { - margin-left: 20px; -} - -.el-dialog { - margin-top: 6vh !important; -} - -.el-table .el-table__header-wrapper th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; -} - -/** 表单布局 **/ -.form-header { - font-size:15px; - color:#6379bb; - border-bottom:1px solid #ddd; - margin:8px 10px 25px 10px; - padding-bottom:5px -} - -/** 表格布局 **/ -.pagination-container { - position: relative; - height: 25px; - margin-bottom: 10px; - margin-top: 15px; - padding: 10px 20px !important; -} - -.pagination-container .el-pagination { - right: 0; - position: absolute; -} - -.el-table .fixed-width .el-button--mini { - color: #409EFF; - padding-left: 0; - padding-right: 0; - width: inherit; -} - -.el-tree-node__content > .el-checkbox { - margin-right: 8px; -} - -.list-group-striped > .list-group-item { - border-left: 0; - border-right: 0; - border-radius: 0; - padding-left: 0; - padding-right: 0; -} - -.list-group { - padding-left: 0px; - list-style: none; -} - -.list-group-item { - border-bottom: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - margin-bottom: -1px; - padding: 11px 0px; - font-size: 13px; -} - -.pull-right { - float: right !important; -} - -.el-card__header { - padding: 14px 15px 7px; - min-height: 40px; -} - -.el-card__body { - padding: 15px 20px 20px 20px; -} - -.card-box { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 10px; -} - -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} - -.img-lg { - width: 120px; - height: 120px; -} - -.avatar-upload-preview { - position: absolute; - top: 50%; - transform: translate(50%, -50%); - width: 180px; - height: 180px; - border-radius: 50%; - box-shadow: 0 0 4px #ccc; - overflow: hidden; -} - -/* 拖拽列样式 */ -.sortable-ghost{ - opacity: .8; - color: #fff!important; - background: #42b983!important; -} \ No newline at end of file + /** + * 通用css样式布局处理 + * Copyright (c) 2019 ruoyi + */ + + /** 基础通用 **/ +.pt5 { + padding-top: 5px; +} +.pr5 { + padding-right: 5px; +} +.pb5 { + padding-bottom: 5px; +} +.mt5 { + margin-top: 5px; +} +.mr5 { + margin-right: 5px; +} +.mb5 { + margin-bottom: 5px; +} +.mb8 { + margin-bottom: 8px; +} +.ml5 { + margin-left: 5px; +} +.mt10 { + margin-top: 10px; +} +.mr10 { + margin-right: 10px; +} +.mb10 { + margin-bottom: 10px; +} +.ml0 { + margin-left: 10px; +} +.mt20 { + margin-top: 20px; +} +.mr20 { + margin-right: 20px; +} +.mb20 { + margin-bottom: 20px; +} +.m20 { + margin-left: 20px; +} + +.el-dialog { + margin-top: 6vh !important; +} + +.el-table .el-table__header-wrapper th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 40px; + font-size: 13px; +} + +/** 表单布局 **/ +.form-header { + font-size:15px; + color:#6379bb; + border-bottom:1px solid #ddd; + margin:8px 10px 25px 10px; + padding-bottom:5px +} + +/** 表格布局 **/ +.pagination-container { + position: relative; + margin: 0; + background: #fff; + padding: 10px 0; + display: flex; + justify-content: flex-end; + @media (max-width: 768.98px) { + .el-pagination__sizes, .el-pagination__total { + display: none !important; + } + .el-pagination__jump { + margin-left: 5px; + } + } +} + +.el-table .fixed-width .el-button--mini { + color: #409EFF; + padding-left: 0; + padding-right: 0; + width: inherit; +} + +.el-tree-node__content > .el-checkbox { + margin-right: 8px; +} + +.list-group-striped > .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0; +} + +.list-group { + padding-left: 0px; + list-style: none; +} + +.list-group-item { + border-bottom: 1px solid #e7eaec; + border-top: 1px solid #e7eaec; + margin-bottom: -1px; + padding: 11px 0px; + font-size: 13px; +} + +.pull-right { + float: right !important; +} + +.el-card__header { + padding: 14px 15px 7px; + min-height: 40px; +} + +.el-card__body { + padding: 15px 20px 20px 20px; +} + +.card-box { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 10px; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} + +/* image */ +.img-circle { + border-radius: 50%; +} + +.img-lg { + width: 120px; + height: 120px; +} + +.avatar-upload-preview { + position: absolute; + top: 50%; + transform: translate(50%, -50%); + width: 180px; + height: 180px; + border-radius: 50%; + box-shadow: 0 0 4px #ccc; + overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost{ + opacity: .8; + color: #fff!important; + background: #42b983!important; +} diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue index 08ff09046..fea499ae6 100644 --- a/ruoyi-ui/src/components/Pagination/index.vue +++ b/ruoyi-ui/src/components/Pagination/index.vue @@ -1,101 +1,97 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/benyi/activity/index.vue b/ruoyi-ui/src/views/benyi/activity/index.vue index 307f9c133..4d649bd67 100644 --- a/ruoyi-ui/src/views/benyi/activity/index.vue +++ b/ruoyi-ui/src/views/benyi/activity/index.vue @@ -52,8 +52,8 @@

入场券：一个家庭一张票，所有家庭持票入场，允许一个家长带领一名幼儿，摊主家庭的另外一位家长需要出示摊位号。

入场券可以做成正副联、也可以做成单张。如图：

- - + +

入场券幼儿园可以自己设计制作，正面背景是幼儿园图片，写上活动名称及时间、地点。入场券的背面写上注意事项和活动规则。

摊位号：需要准备2套摊位号。1套在交摊位费报名时发给摊主，方便摊主在活动当天直接按号就位。另1套放在抽奖箱中用于抽奖时使用。

@@ -65,8 +65,8 @@

另一种是不同面值的人民币若干，1元、5元和10元。方便活动结束后家长用剩余的游戏币兑换人民币。

管理员和摊主挂牌：可制作袖章或颈挂牌明确身份。

- - + +

奖品：摊主可凭摊位号参与抽奖活动，根据摊主人数合理安排奖品的等级和每个等级的人数。如：一等奖5名、二等奖10名、三等奖15名。

其他人员可凭入场券每个孩子均可获得一份参与奖品。

@@ -241,6 +241,9 @@ export default { margin: 0 auto; color: #333; height: 100%; + @media (max-width: 768.98px) { + padding: 0 3%; + } ::v-deep .el-tabs__item { font-weight: bold; } @@ -295,6 +298,10 @@ export default { img { flex: 1; padding: 5px; + width: 100%; + &.img2 { + width: 50%; + } } } .row-item { @@ -304,4 +311,4 @@ export default { } } } - \ No newline at end of file + diff --git a/ruoyi-ui/src/views/benyi/calendarshow/index.vue b/ruoyi-ui/src/views/benyi/calendarshow/index.vue index 5bacf2d60..655f014c3 100644 --- a/ruoyi-ui/src/views/benyi/calendarshow/index.vue +++ b/ruoyi-ui/src/views/benyi/calendarshow/index.vue @@ -166,6 +166,11 @@ export default { } .btn { width: 96px; + @media (max-width: 768.98px) { + width: auto; + padding: 6px 7px; + font-size: 12px; + } } .no-border-btn { border: none; @@ -177,4 +182,12 @@ export default { } } } +@media (max-width: 768.98px) { + .fc button { + height: 30px; + } + .fc-toolbar h2 { + font-size: 16px; + } +} diff --git a/ruoyi-ui/src/views/benyi/checkindetail/index.vue b/ruoyi-ui/src/views/benyi/checkindetail/index.vue index f6150306a..755348b5f 100644 --- a/ruoyi-ui/src/views/benyi/checkindetail/index.vue +++ b/ruoyi-ui/src/views/benyi/checkindetail/index.vue @@ -1,6 +1,11 @@