只能上传不超过 {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 4e65504..a99325f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,16 +1,16 @@
-import { parseTime } from './ruoyi'
+import {parseTime} from './ruoyi'
/**
* 表格时间格式化
*/
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
}
@@ -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
@@ -330,7 +330,7 @@ export function makeMap(str, expectsLowerCase) {
? val => map[val.toLowerCase()]
: val => map[val]
}
-
+
export const exportDefault = 'export default '
export const beautifierConf = {
@@ -387,4 +387,4 @@ export function camelCase(str) {
export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
}
-
+
diff --git a/src/utils/request.js b/src/utils/request.js
index ffb0d21..1018391 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,15 +1,15 @@
import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import {Loading, Message, MessageBox, Notification} from 'element-ui'
import store from '@/store'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import {blobValidate, tansParams} 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,8 +67,8 @@ service.interceptors.request.use(config => {
}
return config
}, error => {
- console.log(error)
- Promise.reject(error)
+ console.log(error)
+ Promise.reject(error)
})
// 响应拦截器
@@ -78,30 +78,34 @@ service.interceptors.response.use(res => {
// 获取错误信息
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
@@ -109,7 +113,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")) {
@@ -117,17 +121,23 @@ 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
index 44bf9c4..38d9dc3 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -1,5 +1,3 @@
-
-
/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
@@ -37,7 +35,9 @@ export function parseTime(time, pattern) {
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 (key === 'a') {
+ return ['日', '一', '二', '三', '四', '五', '六'][value]
+ }
if (result.length > 0 && value < 10) {
value = '0' + value
}
@@ -88,7 +88,7 @@ export function selectDictLabel(datas, value) {
// 回显数据字典（字符串、数组）
export function selectDictLabels(datas, value, separator) {
- if (value === undefined || value.length ===0) {
+ if (value === undefined || value.length === 0) {
return "";
}
if (Array.isArray(value)) {
@@ -148,7 +148,7 @@ export function mergeRecursive(source, target) {
}
}
return source;
-};
+}
/**
* 构造树型结构数据
@@ -198,13 +198,14 @@ export function handleTree(data, id, parentId, children) {
}
}
}
+
return tree;
}
/**
-* 参数处理
-* @param {*} params 参数
-*/
+ * 参数处理
+ * @param {*} params 参数
+ */
export function tansParams(params) {
let result = ''
for (const propName of Object.keys(params)) {
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
index c5d8e04..09fa393 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,8 +8,10 @@ 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)
+ }
})()
/**
@@ -37,7 +39,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/views/components/icons/index.vue b/src/views/components/icons/index.vue
index d3c9a71..8215c98 100644
--- a/src/views/components/icons/index.vue
+++ b/src/views/components/icons/index.vue
@@ -12,7 +12,7 @@
{{ generateIconCode(item) }}
- 
-