Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
| | |
| | | ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); |
| | | ajax.put("posts", postService.selectPostAll()); |
| | | if (StringUtils.isNotNull(userId)) { |
| | | ajax.put("user", userService.selectUserById(userId)); |
| | | SysUser sysUser = userService.selectUserById(userId); |
| | | ajax.put("user", sysUser); |
| | | ajax.put("postIds", postService.selectPostListByUserId(userId)); |
| | | ajax.put("roleIds", roleService.selectRoleListByUserId(userId)); |
| | | ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); |
| | | } |
| | | return AjaxResult.success(ajax); |
| | | } |
| | |
| | | import request from '@/utils/request' |
| | | import { praseStrEmpty } from "@/utils/ruoyi"; |
| | | import { parseStrEmpty } from "@/utils/ruoyi"; |
| | | |
| | | // 查询用户列表 |
| | | export function listUser(query) { |
| | |
| | | // 查询用户详细 |
| | | export function getUser(userId) { |
| | | return request({ |
| | | url: '/system/user/' + praseStrEmpty(userId), |
| | | url: '/system/user/' + parseStrEmpty(userId), |
| | | method: 'get' |
| | | }) |
| | | } |
| | |
| | | <el-radio v-model='radioValue' :label="4">
|
| | | 指定
|
| | | <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
|
| | | <el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
|
| | | <el-option v-for="item in 24" :key="item" :value="item-1">{{item-1}}</el-option> |
| | | </el-select>
|
| | | </el-radio>
|
| | | </el-form-item>
|
| | |
| | | <template> |
| | | <el-image :src="`${realSrc}`" fit="cover" :style="`width:${realWidth};height:${realHeight};`" :preview-src-list="[`${realSrc}`]"> |
| | | <el-image |
| | | :src="`${realSrc}`" |
| | | fit="cover" |
| | | :style="`width:${realWidth};height:${realHeight};`" |
| | | :preview-src-list="realSrcList" |
| | | > |
| | | <div slot="error" class="image-slot"> |
| | | <i class="el-icon-picture-outline"></i> |
| | | </div> |
| | |
| | | </template> |
| | | |
| | | <script> |
| | | import { isExternal } from '@/utils/validate' |
| | | import { isExternal } from "@/utils/validate"; |
| | | |
| | | export default { |
| | | name: 'ImagePreview', |
| | | name: "ImagePreview", |
| | | props: { |
| | | src: { |
| | | type: String, |
| | |
| | | }, |
| | | width: { |
| | | type: [Number, String], |
| | | default: '' |
| | | default: "" |
| | | }, |
| | | height: { |
| | | type: [Number, String], |
| | | default: '' |
| | | default: "" |
| | | } |
| | | }, |
| | | computed: { |
| | | realSrc() { |
| | | if (isExternal(this.src)) { |
| | | return this.src |
| | | let real_src = this.src.split(",")[0]; |
| | | if (isExternal(real_src)) { |
| | | return real_src; |
| | | } |
| | | return process.env.VUE_APP_BASE_API + this.src |
| | | return process.env.VUE_APP_BASE_API + real_src; |
| | | }, |
| | | realSrcList() { |
| | | let real_src_list = this.src.split(","); |
| | | let srcList = []; |
| | | real_src_list.forEach(item => { |
| | | if (isExternal(item)) { |
| | | return srcList.push(item); |
| | | } |
| | | return srcList.push(process.env.VUE_APP_BASE_API + item); |
| | | }); |
| | | return srcList; |
| | | }, |
| | | realWidth() { |
| | | return typeof this.width == 'string' ? this.width : `${this.width}px` |
| | | return typeof this.width == "string" ? this.width : `${this.width}px`; |
| | | }, |
| | | realHeight() { |
| | | return typeof this.height == 'string' ? this.height : `${this.height}px` |
| | | return typeof this.height == "string" ? this.height : `${this.height}px`; |
| | | } |
| | | } |
| | | } |
| | | }, |
| | | }; |
| | | </script> |
| | | |
| | | <style lang="scss" scoped> |
| | |
| | | import { getToken } from '@/utils/auth' |
| | | import errorCode from '@/utils/errorCode' |
| | | import { tansParams, blobValidate } from "@/utils/ruoyi"; |
| | | import cache from '@/plugins/cache' |
| | | import { saveAs } from 'file-saver' |
| | | |
| | | let downloadLoadingInstance; |
| | | // 是否显示重新登录 |
| | | let isReloginShow; |
| | | |
| | | axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' |
| | | // 对应国际化资源文件后缀 |
| | |
| | | service.interceptors.request.use(config => { |
| | | // 是否需要设置 token |
| | | const isToken = (config.headers || {}).isToken === false |
| | | // 是否需要防止数据重复提交 |
| | | const isRepeatSubmit = (config.headers || {}).repeatSubmit === false |
| | | if (getToken() && !isToken) { |
| | | config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 |
| | | } |
| | |
| | | url = url.slice(0, -1); |
| | | config.params = {}; |
| | | config.url = url; |
| | | } |
| | | if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { |
| | | const requestObj = { |
| | | url: config.url, |
| | | data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, |
| | | time: new Date().getTime() |
| | | } |
| | | const sessionObj = cache.session.getJSON('sessionObj') |
| | | if (sessionObj === undefined || sessionObj === null || sessionObj === '') { |
| | | cache.session.setJSON('sessionObj', requestObj) |
| | | } else { |
| | | const s_url = sessionObj.url; // 请求地址 |
| | | const s_data = sessionObj.data; // 请求数据 |
| | | const s_time = sessionObj.time; // 请求时间 |
| | | const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交 |
| | | if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { |
| | | const message = '数据正在处理,请勿重复提交'; |
| | | console.warn(`[${s_url}]: ` + message) |
| | | return Promise.reject(new Error(message)) |
| | | } else { |
| | | cache.session.setJSON('sessionObj', requestObj) |
| | | } |
| | | } |
| | | } |
| | | return config |
| | | }, error => { |
| | |
| | | return res.data |
| | | } |
| | | if (code === 401) { |
| | | if (!isReloginShow) { |
| | | isReloginShow = true; |
| | | MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { |
| | | confirmButtonText: '重新登录', |
| | | cancelButtonText: '取消', |
| | | type: 'warning' |
| | | } |
| | | ).then(() => { |
| | | isReloginShow = false; |
| | | store.dispatch('LogOut').then(() => { |
| | | // 如果是登录页面不需要重新加载 |
| | | if (window.location.hash.indexOf("#/login") != 0) { |
| | | location.href = process.env.VUE_APP_CONTEXT_PATH + "index"; |
| | | } |
| | | }) |
| | | }).catch(() => {}); |
| | | }).catch(() => { |
| | | isReloginShow = false; |
| | | }); |
| | | } |
| | | return Promise.reject('无效的会话,或者会话已过期,请重新登录。') |
| | | } else if (code === 500) { |
| | | Message({ |
| | |
| | | |
| | | |
| | | /** |
| | | * 通用js方法封装处理 |
| | | * Copyright (c) 2019 ruoyi |
| | |
| | | |
| | | // 回显数据字典(字符串数组) |
| | | export function selectDictLabels(datas, value, separator) { |
| | | if(value === undefined) { |
| | | return ""; |
| | | } |
| | | var actions = []; |
| | | var currentSeparator = undefined === separator ? "," : separator; |
| | | var temp = value.split(currentSeparator); |
| | |
| | | } |
| | | |
| | | // 转换字符串,undefined,null等转化为"" |
| | | export function praseStrEmpty(str) { |
| | | export function parseStrEmpty(str) { |
| | | if (!str || str == "undefined" || str == "null") { |
| | | return ""; |
| | | } |
| | |
| | | // 节点单击事件 |
| | | handleNodeClick(data) { |
| | | this.queryParams.deptId = data.id; |
| | | this.getList(); |
| | | this.handleQuery(); |
| | | }, |
| | | // 用户状态修改 |
| | | handleStatusChange(row) { |
| | |
| | | <el-option label="Double" value="Double" /> |
| | | <el-option label="BigDecimal" value="BigDecimal" /> |
| | | <el-option label="Date" value="Date" /> |
| | | <el-option label="Boolean" value="Boolean" /> |
| | | </el-select> |
| | | </template> |
| | | </el-table-column> |