diff --git a/src/mock/chart/G2Bar.js b/src/mock/chart/G2Bar.js index 05498d4f..14e7da05 100644 --- a/src/mock/chart/G2Bar.js +++ b/src/mock/chart/G2Bar.js @@ -1,16 +1,5 @@ import Mock from 'mockjs' - -const r = (add = 0) => { - return Math.round(Math.random() * 100) + add -} - -const returnMaker = (data = []) => { - return { - code: 0, - msg: '请求成功', - data - } -} +import * as fn from './_publicFunction' Mock.mock('/api/chart/G2Bar', 'post', ({body, type, url}) => { const _body = JSON.parse(body) @@ -20,14 +9,14 @@ Mock.mock('/api/chart/G2Bar', 'post', ({body, type, url}) => { const year = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月'] const data = year.map(e => ({ year: e, - value: r() + value: fn.r() })).map(e => ({ x: e.year, y: e.value })).sort((a, b) => { return a.y - b.y }) - return returnMaker(data) + return fn.returnMaker(data) } default: return {} diff --git a/src/mock/chart/G2Column.js b/src/mock/chart/G2Column.js index f0a11681..852d8228 100644 --- a/src/mock/chart/G2Column.js +++ b/src/mock/chart/G2Column.js @@ -1,16 +1,5 @@ import Mock from 'mockjs' - -const r = (add = 0) => { - return Math.round(Math.random() * 100) + add -} - -const returnMaker = (data = []) => { - return { - code: 0, - msg: '请求成功', - data - } -} +import * as fn from './_publicFunction' Mock.mock('/api/chart/G2Column', 'post', ({body, type, url}) => { const _body = JSON.parse(body) @@ -20,12 +9,12 @@ Mock.mock('/api/chart/G2Column', 'post', ({body, type, url}) => { const year = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月'] const data = year.map(e => ({ year: e, - value: r() + value: fn.r() })).map(e => ({ x: e.year, y: e.value })) - return returnMaker(data) + return fn.returnMaker(data) } default: return {} diff --git a/src/mock/chart/G2Line.js b/src/mock/chart/G2Line.js index a459cb2c..365e56af 100644 --- a/src/mock/chart/G2Line.js +++ b/src/mock/chart/G2Line.js @@ -1,16 +1,5 @@ import Mock from 'mockjs' - -const r = (add = 0) => { - return Math.round(Math.random() * 100) + add -} - -const returnMaker = (data = []) => { - return { - code: 0, - msg: '请求成功', - data - } -} +import * as fn from './_publicFunction' Mock.mock('/api/chart/G2Line', 'post', ({body, type, url}) => { const _body = JSON.parse(body) @@ -23,7 +12,7 @@ Mock.mock('/api/chart/G2Line', 'post', ({body, type, url}) => { year: e, value: 0 })).map(e => { - e.value = last + r() + e.value = last + fn.r() last = e.value return e }).map(e => ({ @@ -31,19 +20,19 @@ Mock.mock('/api/chart/G2Line', 'post', ({body, type, url}) => { y: e.value })) last = 0 - return returnMaker(data) + return fn.returnMaker(data) } // 阶梯折线图 case 'step': { const month = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月'] const data = month.map(e => ({ month: e, - value: r() + value: fn.r() })).map(e => ({ x: e.month, y: e.value })) - return returnMaker(data) + return fn.returnMaker(data) } default: return {} diff --git a/src/mock/chart/_publicFunction.js b/src/mock/chart/_publicFunction.js new file mode 100644 index 00000000..80fde36f --- /dev/null +++ b/src/mock/chart/_publicFunction.js @@ -0,0 +1,11 @@ +export const r = (add = 0) => { + return Math.round(Math.random() * 100) + add +} + +export const returnMaker = (data = []) => { + return { + code: 0, + msg: '请求成功', + data + } +}