只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件
)
+ list.push(只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件
)
}
return list
}
diff --git a/src/utils/index.js b/src/utils/index.js
index 5180d44..df5db12 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,4 +1,4 @@
-import {parseTime} from './muyu'
+import { parseTime } from './ruoyi'
/**
* 表格时间格式化
@@ -218,7 +218,7 @@ export function getTime(type) {
export function debounce(func, wait, immediate) {
let timeout, args, context, timestamp, result
- const later = function () {
+ const later = function() {
// 据上一次触发时间间隔
const last = +new Date() - timestamp
@@ -235,7 +235,7 @@ export function debounce(func, wait, immediate) {
}
}
- return function (...args) {
+ return function(...args) {
context = this
timestamp = +new Date()
const callNow = immediate && !timeout
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 1730e33..189a716 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -15,10 +15,8 @@ export function checkPermi(value) {
return all_permission === permission || permissionDatas.includes(permission)
})
- if (!hasPermission) {
- return false
- }
- return true
+ return hasPermission;
+
} else {
console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
return false
@@ -40,10 +38,8 @@ export function checkRole(value) {
return super_admin === role || permissionRoles.includes(role)
})
- if (!hasRole) {
- return false
- }
- return true
+ return hasRole;
+
} else {
console.error(`need roles! Like checkRole="['admin','editor']"`)
return false
diff --git a/src/utils/request.js b/src/utils/request.js
index 47d1bcb..ffb0d21 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,15 +1,15 @@
import axios from 'axios'
-import {Loading, Message, MessageBox, Notification} from 'element-ui'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
import store from '@/store'
-import {getToken} from '@/utils/auth'
+import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
-import {blobValidate, tansParams} from "@/utils/muyu";
+import { tansParams, blobValidate } from "@/utils/ruoyi";
import cache from '@/plugins/cache'
-import {saveAs} from 'file-saver'
+import { saveAs } from 'file-saver'
let downloadLoadingInstance;
// 是否显示重新登录
-export let isRelogin = {show: false};
+export let isRelogin = { show: false };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
@@ -67,46 +67,41 @@ service.interceptors.request.use(config => {
}
return config
}, error => {
- console.log(error)
- Promise.reject(error)
+ console.log(error)
+ Promise.reject(error)
})
// 响应拦截器
service.interceptors.response.use(res => {
- debugger
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
// 二进制数据则直接返回
- if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+ if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data
}
if (code === 401) {
if (!isRelogin.show) {
isRelogin.show = true;
- MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
+ MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
location.href = '/index';
})
- }).catch(() => {
- isRelogin.show = false;
- });
- }
+ }).catch(() => {
+ isRelogin.show = false;
+ });
+ }
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {
- Message({message: msg, type: 'error'})
+ Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg))
} else if (code === 601) {
- Message({message: msg, type: 'warning'})
+ Message({ message: msg, type: 'warning' })
return Promise.reject('error')
} else if (code !== 200) {
- Notification.error({title: msg})
+ Notification.error({ title: msg })
return Promise.reject('error')
} else {
return res.data
@@ -114,7 +109,7 @@ service.interceptors.response.use(res => {
},
error => {
console.log('err' + error)
- let {message} = error;
+ let { message } = error;
if (message == "Network Error") {
message = "后端接口连接异常";
} else if (message.includes("timeout")) {
@@ -122,23 +117,17 @@ service.interceptors.response.use(res => {
} else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常";
}
- Message({message: message, type: 'error', duration: 5 * 1000})
+ Message({ message: message, type: 'error', duration: 5 * 1000 })
return Promise.reject(error)
}
)
// 通用下载方法
export function download(url, params, filename, config) {
- downloadLoadingInstance = Loading.service({
- text: "正在下载数据，请稍候",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)",
- })
+ downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
- transformRequest: [(params) => {
- return tansParams(params)
- }],
- headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+ transformRequest: [(params) => { return tansParams(params) }],
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob',
...config
}).then(async (data) => {
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
new file mode 100644
index 0000000..44bf9c4
--- /dev/null
+++ b/src/utils/ruoyi.js
@@ -0,0 +1,233 @@
+
+
+/**
+ * 通用js方法封装处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+// 日期格式化
+export function parseTime(time, pattern) {
+ if (arguments.length === 0 || !time) {
+ return null
+ }
+ const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+ let date
+ if (typeof time === 'object') {
+ date = time
+ } else {
+ if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+ time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+ }
+ if ((typeof time === 'number') && (time.toString().length === 10)) {
+ time = time * 1000
+ }
+ date = new Date(time)
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 1,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay()
+ }
+ const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+ let value = formatObj[key]
+ // Note: getDay() returns 0 on Sunday
+ if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+ if (result.length > 0 && value < 10) {
+ value = '0' + value
+ }
+ return value || 0
+ })
+ return time_str
+}
+
+// 表单重置
+export function resetForm(refName) {
+ if (this.$refs[refName]) {
+ this.$refs[refName].resetFields();
+ }
+}
+
+// 添加日期范围
+export function addDateRange(params, dateRange, propName) {
+ let search = params;
+ search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+ dateRange = Array.isArray(dateRange) ? dateRange : [];
+ if (typeof (propName) === 'undefined') {
+ search.params['beginTime'] = dateRange[0];
+ search.params['endTime'] = dateRange[1];
+ } else {
+ search.params['begin' + propName] = dateRange[0];
+ search.params['end' + propName] = dateRange[1];
+ }
+ return search;
+}
+
+// 回显数据字典
+export function selectDictLabel(datas, value) {
+ if (value === undefined) {
+ return "";
+ }
+ var actions = [];
+ Object.keys(datas).some((key) => {
+ if (datas[key].value == ('' + value)) {
+ actions.push(datas[key].label);
+ return true;
+ }
+ })
+ if (actions.length === 0) {
+ actions.push(value);
+ }
+ return actions.join('');
+}
+
+// 回显数据字典（字符串、数组）
+export function selectDictLabels(datas, value, separator) {
+ if (value === undefined || value.length ===0) {
+ return "";
+ }
+ if (Array.isArray(value)) {
+ value = value.join(",");
+ }
+ var actions = [];
+ var currentSeparator = undefined === separator ? "," : separator;
+ var temp = value.split(currentSeparator);
+ Object.keys(value.split(currentSeparator)).some((val) => {
+ var match = false;
+ Object.keys(datas).some((key) => {
+ if (datas[key].value == ('' + temp[val])) {
+ actions.push(datas[key].label + currentSeparator);
+ match = true;
+ }
+ })
+ if (!match) {
+ actions.push(temp[val] + currentSeparator);
+ }
+ })
+ return actions.join('').substring(0, actions.join('').length - 1);
+}
+
+// 字符串格式化(%s )
+export function sprintf(str) {
+ var args = arguments, flag = true, i = 1;
+ str = str.replace(/%s/g, function () {
+ var arg = args[i++];
+ if (typeof arg === 'undefined') {
+ flag = false;
+ return '';
+ }
+ return arg;
+ });
+ return flag ? str : '';
+}
+
+// 转换字符串，undefined,null等转化为""
+export function parseStrEmpty(str) {
+ if (!str || str == "undefined" || str == "null") {
+ return "";
+ }
+ return str;
+}
+
+// 数据合并
+export function mergeRecursive(source, target) {
+ for (var p in target) {
+ try {
+ if (target[p].constructor == Object) {
+ source[p] = mergeRecursive(source[p], target[p]);
+ } else {
+ source[p] = target[p];
+ }
+ } catch (e) {
+ source[p] = target[p];
+ }
+ }
+ return source;
+};
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ */
+export function handleTree(data, id, parentId, children) {
+ let config = {
+ id: id || 'id',
+ parentId: parentId || 'parentId',
+ childrenList: children || 'children'
+ };
+
+ var childrenListMap = {};
+ var nodeIds = {};
+ var tree = [];
+
+ for (let d of data) {
+ let parentId = d[config.parentId];
+ if (childrenListMap[parentId] == null) {
+ childrenListMap[parentId] = [];
+ }
+ nodeIds[d[config.id]] = d;
+ childrenListMap[parentId].push(d);
+ }
+
+ for (let d of data) {
+ let parentId = d[config.parentId];
+ if (nodeIds[parentId] == null) {
+ tree.push(d);
+ }
+ }
+
+ for (let t of tree) {
+ adaptToChildrenList(t);
+ }
+
+ function adaptToChildrenList(o) {
+ if (childrenListMap[o[config.id]] !== null) {
+ o[config.childrenList] = childrenListMap[o[config.id]];
+ }
+ if (o[config.childrenList]) {
+ for (let c of o[config.childrenList]) {
+ adaptToChildrenList(c);
+ }
+ }
+ }
+ return tree;
+}
+
+/**
+* 参数处理
+* @param {*} params 参数
+*/
+export function tansParams(params) {
+ let result = ''
+ for (const propName of Object.keys(params)) {
+ const value = params[propName];
+ var part = encodeURIComponent(propName) + "=";
+ if (value !== null && value !== "" && typeof (value) !== "undefined") {
+ if (typeof value === 'object') {
+ for (const key of Object.keys(value)) {
+ if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
+ let params = propName + '[' + key + ']';
+ var subPart = encodeURIComponent(params) + "=";
+ result += subPart + encodeURIComponent(value[key]) + "&";
+ }
+ }
+ } else {
+ result += part + encodeURIComponent(value) + "&";
+ }
+ }
+ }
+ return result
+}
+
+// 验证是否为blob格式
+export function blobValidate(data) {
+ return data.type !== 'application/json'
+}
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
index 09fa393..c5d8e04 100644
--- a/src/utils/scroll-to.js
+++ b/src/utils/scroll-to.js
@@ -1,4 +1,4 @@
-Math.easeInOutQuad = function (t, b, c, d) {
+Math.easeInOutQuad = function(t, b, c, d) {
t /= d / 2
if (t < 1) {
return c / 2 * t * t + b
@@ -8,10 +8,8 @@ Math.easeInOutQuad = function (t, b, c, d) {
}
// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
-var requestAnimFrame = (function () {
- return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function (callback) {
- window.setTimeout(callback, 1000 / 60)
- }
+var requestAnimFrame = (function() {
+ return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
})()
/**
@@ -39,7 +37,7 @@ export function scrollTo(to, duration, callback) {
const increment = 20
let currentTime = 0
duration = (typeof (duration) === 'undefined') ? 500 : duration
- var animateScroll = function () {
+ var animateScroll = function() {
// increment the time
currentTime += increment
// find the value with the quadratic in-out easing function
diff --git a/src/utils/validate.js b/src/utils/validate.js
index adfa254..57a568e 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -65,10 +65,7 @@ export function validEmail(email) {
* @returns {Boolean}
*/
export function isString(str) {
- if (typeof str === 'string' || str instanceof String) {
- return true
- }
- return false
+ return typeof str === 'string' || str instanceof String;
}
/**
diff --git a/src/views/dashboard/BarChart.vue b/src/views/dashboard/BarChart.vue
index e175369..88e7ef6 100644
--- a/src/views/dashboard/BarChart.vue
+++ b/src/views/dashboard/BarChart.vue
@@ -1,12 +1,11 @@
-
+
+
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index 6282882..448b6ec 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -1,6 +1,6 @@
-
+
返回
@@ -19,7 +19,7 @@
- ![Girl has dropped her ice cream.]()
+ ![Girl has dropped her ice cream.]()
@@ -38,7 +38,7 @@ export default {
methods: {
back() {
if (this.$route.query.noGoBack) {
- this.$router.push({path: '/'})
+ this.$router.push({ path: '/' })
} else {
this.$router.go(-1)
}
@@ -48,49 +48,41 @@ export default {
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 192c806..96f075c 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -2,10 +2,10 @@
- 
- 
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -17,7 +17,7 @@
+
返回首页
@@ -38,32 +38,27 @@ export default {
diff --git a/src/views/tool/build/TreeNodeDialog.vue b/src/views/tool/build/TreeNodeDialog.vue
index 588e861..fa7f0b2 100644
--- a/src/views/tool/build/TreeNodeDialog.vue
+++ b/src/views/tool/build/TreeNodeDialog.vue
@@ -1,20 +1,20 @@
对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
-