clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

This commit is contained in:
caohong 2021-08-30 16:30:02 +08:00
parent 60da5801a2 40bdf7b100
commit 93c1f9aaa9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-ui/src/api/login.js
View File

@ -49,6 +49,7 @@ export function logout() {
export function getCodeImg() { export function getCodeImg() {
return request({ return request({
url: '/code', url: '/code',
method: 'get' method: 'get',
timeout: 20000
}) })
} }

6
ruoyi-ui/src/components/DictTag/index.vue
View File

@ -31,12 +31,12 @@ export default {
type: Array, type: Array,
default: null, default: null,
}, },
value: [String, Array], value: [Number, String, Array],
}, },
computed: { computed: {
values() { values() {
if (this.value) { if (this.value !== null && typeof this.value !== 'undefined') {
return Array.isArray(this.value) ? this.value : [this.value]; return Array.isArray(this.value) ? this.value : [String(this.value)];
} else { } else {
return []; return [];
} }

19
ruoyi-ui/src/utils/ruoyi.js
View File

@ -18,7 +18,7 @@ export function parseTime(time, pattern) {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time) time = parseInt(time)
} else if (typeof time === 'string') { } else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/'); time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
} }
if ((typeof time === 'number') && (time.toString().length === 10)) { if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000 time = time * 1000
@ -55,16 +55,15 @@ export function resetForm(refName) {
// 添加日期范围 // 添加日期范围
export function addDateRange(params, dateRange, propName) { export function addDateRange(params, dateRange, propName) {
var search = params; let search = params;
search.params = {}; search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
if (null != dateRange && '' != dateRange) { dateRange = Array.isArray(dateRange) ? dateRange : [];
if (typeof (propName) === "undefined") { if (typeof (propName) === 'undefined') {
search.params["beginTime"] = dateRange[0]; search.params['beginTime'] = dateRange[0];
search.params["endTime"] = dateRange[1]; search.params['endTime'] = dateRange[1];
} else { } else {
search.params["begin" + propName] = dateRange[0]; search.params['begin' + propName] = dateRange[0];
search.params["end" + propName] = dateRange[1]; search.params['end' + propName] = dateRange[1];
}
} }
return search; return search;
} }