diff --git a/package.json b/package.json index b72b4cf..184d98a 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,11 @@ }, "lint-staged": { "*.js": [ - "vue-cli-service lint", + "git add" ], "*.vue": [ - "vue-cli-service lint", + "git add" ] } diff --git a/src/api/data.js b/src/api/data.js index 8b72928..f84bfad 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -128,4 +128,4 @@ export const getTreeSelectData = () => { url: 'get_tree_select_data', method: 'get' }) -} \ No newline at end of file +} diff --git a/src/libs/axios.js b/src/libs/axios.js index 74cd85e..bb6dffb 100644 --- a/src/libs/axios.js +++ b/src/libs/axios.js @@ -26,7 +26,7 @@ class HttpRequest { const config = { baseURL: this.baseUrl, headers: { - "Content-type": "text/html" + 'Content-type': 'text/html' } } return config @@ -54,7 +54,7 @@ class HttpRequest { } else { console.log(res) Notice.error({ title: '错误 ' + res.error, desc: res.msg || '错误!' }) - if(res.error === 401) { + if (res.error === 401) { store.dispatch('handleLogOut').then(res => { router.push({ name: 'login' }) }) @@ -74,7 +74,7 @@ class HttpRequest { } } addErrorLog(errorInfo) - if(errorInfo.status === 401) { + if (errorInfo.status === 401) { store.dispatch('handleLogOut').then(res => { router.push({ name: 'login' }) }) diff --git a/src/libs/util.js b/src/libs/util.js index 03ae431..8e5e287 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -398,27 +398,27 @@ export const setTitle = (routeItem, vm) => { window.document.title = resTitle } -//加法 -export function accAdd(arg1, arg2) { - var r1, r2, m; - try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 } - try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 } +// 加法 +export function accAdd (arg1, arg2) { + var r1, r2, m + try { r1 = arg1.toString().split('.')[1].length } catch (e) { r1 = 0 } + try { r2 = arg2.toString().split('.')[1].length } catch (e) { r2 = 0 } m = Math.pow(10, Math.max(r1, r2)) return (Math.round(arg1 * m) + Math.round(arg2 * m)) / m } -//减法 -export function accSub(arg1, arg2) { - var r1, r2, m, n; - try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 } - try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 } - m = Math.pow(10, Math.max(r1, r2)); - n = (r1 >= r2) ? r1 : r2; - return ((arg1 * m - arg2 * m) / m).toFixed(n); -} -//乘法 -export function accMul(arg1, arg2) { - var m = 0, s1 = arg1.toString(), s2 = arg2.toString(); - try { m += s1.split(".")[1].length } catch (e) { } - try { m += s2.split(".")[1].length } catch (e) { } - return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m) -} \ No newline at end of file +// 减法 +export function accSub (arg1, arg2) { + var r1, r2, m, n + try { r1 = arg1.toString().split('.')[1].length } catch (e) { r1 = 0 } + try { r2 = arg2.toString().split('.')[1].length } catch (e) { r2 = 0 } + m = Math.pow(10, Math.max(r1, r2)) + n = (r1 >= r2) ? r1 : r2 + return ((arg1 * m - arg2 * m) / m).toFixed(n) +} +// 乘法 +export function accMul (arg1, arg2) { + var m = 0, s1 = arg1.toString(), s2 = arg2.toString() + try { m += s1.split('.')[1].length } catch (e) { } + try { m += s2.split('.')[1].length } catch (e) { } + return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m) +} diff --git a/src/libs/vue-db.js b/src/libs/vue-db.js index 71baa03..1355973 100644 --- a/src/libs/vue-db.js +++ b/src/libs/vue-db.js @@ -1,5 +1,5 @@ class VueDB { - constructor(key){ + constructor (key) { this.key = key } @@ -10,7 +10,6 @@ class VueDB { if (window.sessionStorage) { window.sessionStorage.setItem(key, value) - } } @@ -44,7 +43,7 @@ class VueDB { } } - setDB(key, value){ + setDB (key, value) { let idStr = this.getItem(key).toString() if (!idStr) { idStr = Date.now().toString(36) + Math.random().toString(36).substr(3) @@ -60,7 +59,7 @@ class VueDB { let hexCharCode = [] hexCharCode.push('0x') for (var i = 0; i < str.length; i++) { - hexCharCode.push((str.charCodeAt(i)).toString(16)); + hexCharCode.push((str.charCodeAt(i)).toString(16)) } return hexCharCode.join('') } @@ -86,11 +85,10 @@ class VueDB { return this.getItem(idStr).toJson() || this.getItem(idStr).toString() } - removeDB(key){ + removeDB (key) { let idStr = this.hexCharCodeToStr(this.getItem(key).toString()) this.removeItem(idStr) this.removeItem(key) } - } export default VueDB diff --git a/src/router/index.js b/src/router/index.js index 580c8ea..3fd6513 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ const { homeName } = config Vue.use(Router) const router = new Router({ - routes, + routes // mode: 'history' }) const LOGIN_PAGE_NAME = 'login' diff --git a/src/store/module/info.js b/src/store/module/info.js index 2e0fe89..545c207 100644 --- a/src/store/module/info.js +++ b/src/store/module/info.js @@ -28,6 +28,6 @@ export default { delAccount, addAccount, setFactory, - setReboot, + setReboot } } diff --git a/src/store/module/user.js b/src/store/module/user.js index e09061e..64c69d6 100644 --- a/src/store/module/user.js +++ b/src/store/module/user.js @@ -17,7 +17,7 @@ export default { avatarImgPath: require('@/assets/images/defult_header_img.jpg'), token: getToken(), access: '', - hasGetInfo: DB.getDB('user-name') ? true:false, + hasGetInfo: !!DB.getDB('user-name'), unreadCount: 0, messageUnreadList: [], messageReadedList: [], @@ -71,7 +71,7 @@ export default { messageUnreadCount: state => state.messageUnreadList.length, messageReadedCount: state => state.messageReadedList.length, messageTrashCount: state => state.messageTrashList.length, - userName: state => state.userName, + userName: state => state.userName }, actions: { // 登录 diff --git a/src/view/ADvanced/index.vue b/src/view/ADvanced/index.vue index e0eb09d..ec2db66 100644 --- a/src/view/ADvanced/index.vue +++ b/src/view/ADvanced/index.vue @@ -38,7 +38,7 @@