ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -1,129 +1,143 @@ /** * 通用css样式布局处理 * Copyright (c) 2019 ruoyi */ /** * 通用css样式布局处理 * Copyright (c) 2019 ruoyi */ /** 基础通用 **/ /** 基础通用 **/ .pt5 { padding-top: 5px; padding-top: 5px; } .pr5 { padding-right: 5px; padding-right: 5px; } .pb5 { padding-bottom: 5px; padding-bottom: 5px; } .mt5 { margin-top: 5px; margin-top: 5px; } .mr5 { margin-right: 5px; margin-right: 5px; } .mb5 { margin-bottom: 5px; margin-bottom: 5px; } .mb8 { margin-bottom: 8px; margin-bottom: 8px; } .ml5 { margin-left: 5px; margin-left: 5px; } .mt10 { margin-top: 10px; margin-top: 10px; } .mr10 { margin-right: 10px; margin-right: 10px; } .mb10 { margin-bottom: 10px; margin-bottom: 10px; } .ml10 { margin-left: 10px; } .mt20 { margin-top: 20px; margin-top: 20px; } .mr20 { margin-right: 20px; margin-right: 20px; } .mb20 { margin-bottom: 20px; margin-bottom: 20px; } .ml20 { margin-left: 20px; } .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit; font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit; } .el-message-box__status + .el-message-box__message{ word-break: break-word; word-break: break-word; } .el-dialog:not(.is-fullscreen) { margin-top: 6vh !important; margin-top: 6vh !important; } .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { overflow: auto; overflow-x: hidden; max-height: 70vh; padding: 10px 20px 0; overflow: auto; overflow-x: hidden; max-height: 70vh; padding: 10px 20px 0; } .el-table { .el-table__header-wrapper, .el-table__fixed-header-wrapper { th { word-break: break-word; background-color: #f8f8f9; color: #515a6e; height: 40px; font-size: 13px; } } .el-table__body-wrapper { .el-button [class*="el-icon-"] + span { margin-left: 1px; } } .el-table__header-wrapper, .el-table__fixed-header-wrapper { th { word-break: break-word; background-color: #f8f8f9; color: #515a6e; height: 40px; font-size: 13px; } } .el-table__body-wrapper { .el-button [class*="el-icon-"] + span { margin-left: 1px; } } } /** 表单布局 **/ .form-header { font-size:15px; color:#6379bb; border-bottom:1px solid #ddd; margin:8px 10px 25px 10px; padding-bottom:5px 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; position: relative; height: 25px; margin-bottom: 10px; margin-top: 15px; padding: 10px 20px !important; } /* tree border */ .tree-border { margin-top: 5px; border: 1px solid #e5e6e7; background: #FFFFFF none; border-radius:4px; margin-top: 5px; border: 1px solid #e5e6e7; background: #FFFFFF none; border-radius: 4px; } .pagination-container .el-pagination { right: 0; position: absolute; right: 0; position: absolute; } @media ( max-width : 768px) { @media (max-width: 768px) { .pagination-container .el-pagination > .el-pagination__jump { display: none !important; } @@ -133,9 +147,9 @@ } .el-table .fixed-width .el-button--mini { padding-left: 0; padding-right: 0; width: inherit; padding-left: 0; padding-right: 0; width: inherit; } /** 表格更多操作下拉样式 */ @@ -145,51 +159,51 @@ } .el-table .el-dropdown, .el-icon-arrow-down { font-size: 12px; font-size: 12px; } .el-tree-node__content > .el-checkbox { margin-right: 8px; margin-right: 8px; } .list-group-striped > .list-group-item { border-left: 0; border-right: 0; border-radius: 0; padding-left: 0; padding-right: 0; border-left: 0; border-right: 0; border-radius: 0; padding-left: 0; padding-right: 0; } .list-group { padding-left: 0px; list-style: none; 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; border-bottom: 1px solid #e7eaec; border-top: 1px solid #e7eaec; margin-bottom: -1px; padding: 11px 0px; font-size: 13px; } .pull-right { float: right !important; float: right !important; } .el-card__header { padding: 14px 15px 7px; min-height: 40px; padding: 14px 15px 7px; min-height: 40px; } .el-card__body { padding: 15px 20px 20px 20px; padding: 15px 20px 20px 20px; } .card-box { padding-right: 15px; padding-left: 15px; margin-bottom: 10px; padding-right: 15px; padding-left: 15px; margin-bottom: 10px; } /* button color */ @@ -215,63 +229,63 @@ /* text color */ .text-navy { color: #1ab394; color: #1ab394; } .text-primary { color: inherit; color: inherit; } .text-success { color: #1c84c6; color: #1c84c6; } .text-info { color: #23c6c8; color: #23c6c8; } .text-warning { color: #f8ac59; color: #f8ac59; } .text-danger { color: #ed5565; color: #ed5565; } .text-muted { color: #888888; color: #888888; } /* image */ .img-circle { border-radius: 50%; border-radius: 50%; } .img-lg { width: 120px; height: 120px; width: 120px; height: 120px; } .avatar-upload-preview { position: relative; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 200px; height: 200px; border-radius: 50%; box-shadow: 0 0 4px #ccc; overflow: hidden; position: relative; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 200px; height: 200px; border-radius: 50%; box-shadow: 0 0 4px #ccc; overflow: hidden; } /* 拖拽列样式 */ .sortable-ghost{ opacity: .8; color: #fff!important; background: #42b983!important; .sortable-ghost { opacity: .8; color: #fff !important; background: #42b983 !important; } .top-right-btn { position: relative; float: right; position: relative; float: right; } ruoyi-ui/src/components/FileUpload/index.vue
@@ -142,7 +142,7 @@ // 上传失败 handleUploadError(err) { this.$modal.msgError("上传文件失败，请重试"); this.$modal.closeLoading() this.$modal.closeLoading(); }, // 上传成功回调 handleUploadSuccess(res, file) { @@ -174,10 +174,11 @@ }, // 获取文件名称 getFileName(name) { // 如果是url那么取最后的名字 如果不是直接返回 if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { return ""; return name; } }, // 对象转成指定字符串分隔 ruoyi-ui/src/components/ImageUpload/index.vue
@@ -19,7 +19,7 @@ > <i class="el-icon-plus"></i> </el-upload> <!-- 上传提示 --> <div class="el-upload__tip" slot="tip" v-if="showTip"> 请上传 @@ -219,8 +219,8 @@ } ::v-deep .el-list-enter, .el-list-leave-active { opacity: 0; transform: translateY(0); opacity: 0; transform: translateY(0); } </style>
@@ -5,13 +5,12 @@ @select="handleSelect" > <template v-for="(item, index) in topMenus"> <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" ><svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'" :icon-class="item.meta.icon" /> {{ item.meta.title }}</el-menu-item > <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"> <svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'" :icon-class="item.meta.icon"/> {{ item.meta.title }} </el-menu-item> </template> <!-- 顶部菜单超出数量折叠 --> @@ -21,10 +20,12 @@ <el-menu-item :index="item.path" :key="index" v-if="index >= visibleNumber" ><svg-icon :icon-class="item.meta.icon" /> {{ item.meta.title }}</el-menu-item > v-if="index >= visibleNumber"> <svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'" :icon-class="item.meta.icon"/> {{ item.meta.title }} </el-menu-item> </template> </el-submenu> </el-menu> ruoyi-ui/src/directive/permission/hasPermi.js
@@ -2,7 +2,7 @@ * v-hasPermi 操作权限处理 * Copyright (c) 2019 ruoyi */ import store from '@/store' export default { ruoyi-ui/src/directive/permission/hasRole.js
@@ -2,7 +2,7 @@ * v-hasRole 角色权限处理 * Copyright (c) 2019 ruoyi */ import store from '@/store' export default { ruoyi-ui/src/layout/components/Navbar.vue
@@ -8,7 +8,7 @@ <div class="right-menu"> <template v-if="device!=='mobile'"> <search id="header-search" class="right-menu-item" /> <el-tooltip content="源码地址" effect="dark" placement="bottom"> <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" /> </el-tooltip> ruoyi-ui/src/layout/components/Settings/index.vue
@@ -38,7 +38,7 @@ <el-divider/> <h3 class="drawer-title">系统布局配置</h3> <div class="drawer-item"> <span>开启 TopNav</span> <el-switch v-model="topNav" class="drawer-switch" /> ruoyi-ui/src/plugins/tab.js
@@ -35,7 +35,7 @@ return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => { const latestView = visitedViews.slice(-1)[0] if (latestView) { return router.push(latestView.fullPath) return router.push(latestView.fullPath) } return router.push('/'); }); ruoyi-ui/src/utils/index.js
@@ -5,12 +5,12 @@ */ export function formatDate(cellValue) { if (cellValue == null || cellValue == "") return ""; var date = new Date(cellValue) var date = new Date(cellValue) var year = date.getFullYear() var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds } @@ -330,7 +330,7 @@ ? val => map[val.toLowerCase()] : val => map[val] } export const exportDefault = 'export default ' export const beautifierConf = { @@ -387,4 +387,4 @@ export function isNumberStr(str) { return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) }
@@ -3,7 +3,7 @@ </template> <script> import * as echarts from 'echarts'; import * as echarts from 'echarts' require('echarts/theme/macarons') // echarts theme import resize from './mixins/resize'
@@ -3,7 +3,7 @@ </template> <script> import * as echarts from 'echarts'; import * as echarts from 'echarts' require('echarts/theme/macarons') // echarts theme import resize from './mixins/resize'
@@ -3,7 +3,7 @@ </template> <script> import * as echarts from 'echarts'; import * as echarts from 'echarts' require('echarts/theme/macarons') // echarts theme import resize from './mixins/resize'
@@ -3,7 +3,7 @@ </template> <script> import * as echarts from 'echarts'; import * as echarts from 'echarts' require('echarts/theme/macarons') // echarts theme import resize from './mixins/resize'
@@ -160,7 +160,7 @@ /> <!-- 操作日志详细 --> <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body> <el-dialog title="操作日志详细" :visible.sync="open" width="800px" append-to-body> <el-form ref="form" :model="form" label-width="100px" size="mini"> <el-row> <el-col :span="12"> @@ -182,7 +182,7 @@ <el-col :span="24"> <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item> </el-col> <el-col :span="6"> <el-col :span="8"> <el-form-item label="操作状态："> <div v-if="form.status === 0">正常</div> <div v-else-if="form.status === 1">失败</div> @@ -191,7 +191,7 @@ <el-col :span="8"> <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item> </el-col> <el-col :span="10"> <el-col :span="8"> <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item> </el-col> <el-col :span="24"> ruoyi-ui/src/views/system/user/authRole.vue
@@ -33,7 +33,7 @@ </template> </el-table-column> </el-table> <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" /> <el-form label-width="100px">
