diff --git a/config/index.js b/config/index.js index 533e9ea..d01af5c 100644 --- a/config/index.js +++ b/config/index.js @@ -17,6 +17,11 @@ module.exports = { target: 'http://demo.open.renren.io', changeOrigin: true }, + '/sys': { + // target: 'http://demo.open.renren.io', + target: 'http://10.0.1.180:8001', + changeOrigin: true + }, }, // Various Dev Server settings diff --git a/index.html b/index.html index a052466..8c0ef13 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ 数字化管理系统 - + diff --git a/package-lock.json b/package-lock.json index 0d515d5..3813dbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3827,6 +3827,14 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.7.0.tgz", + "integrity": "sha512-NlOTdUcAsIyCCG+N4uh0ZEvXtrPW2jvcuqf03RyqYeCKzyPbiOQ4I3MdKXMhxG3lBdqQNdNXVT71SB4KTQjN0A==", + "requires": { + "zrender": "4.3.0" + } + }, "editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", @@ -19771,6 +19779,11 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" } } + }, + "zrender": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.0.tgz", + "integrity": "sha512-Dii6j2bDsPkxQayuVf2DXJeruIB/mKVxxcGRZQ9GExiBd4c3w7+oBuvo1O/JGHeFeA1nCmSDVDs/S7yKZG1nrA==" } } } diff --git a/package.json b/package.json index 47da658..acbc0bd 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "e2e": "node test/e2e/runner.js", "test": "npm run unit && npm run e2e", "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs", - "build": "gulp" + "build": "node build/build.js", + "gulp": "gulp" }, "dependencies": { "axios": "^0.19.2", diff --git a/src/main.js b/src/main.js index 6c75e37..b5f509a 100644 --- a/src/main.js +++ b/src/main.js @@ -10,21 +10,21 @@ import '@/assets/scss/index.scss' import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios import { isAuth } from '@/utils' // import cloneDeep from 'lodash/cloneDeep' +import echarts from 'echarts' + import VCharts from 'v-charts' Vue.use(VCharts) -// import echarts from 'echarts/lib/echarts' -// console.log(111) -// console.log(echarts) -// debugger + Vue.use(VueCookie) Vue.config.productionTip = false // 非生产环境, 适配mockjs模拟数据 // api: https://github.com/nuysoft/Mock -if (process.env.NODE_ENV !== 'production') { - require('@/mock') -} +// if (process.env.NODE_ENV !== 'production') { +// require('@/mock') +// } // 挂载全局 +Vue.prototype.$echarts = echarts // echarts画图 Vue.prototype.$http = httpRequest // ajax请求方法 Vue.prototype.isAuth = isAuth // 权限方法 diff --git a/src/views/business/staff/staff-archives/index.vue b/src/views/business/staff/staff-archives/index.vue index 6f23797..46b720f 100644 --- a/src/views/business/staff/staff-archives/index.vue +++ b/src/views/business/staff/staff-archives/index.vue @@ -1,5 +1,37 @@ + + diff --git a/src/views/business/staff/staff-profile/componments/chart-form/index.vue b/src/views/business/staff/staff-profile/componments/chart-form/index.vue index 0ab619e..235d8d0 100644 --- a/src/views/business/staff/staff-profile/componments/chart-form/index.vue +++ b/src/views/business/staff/staff-profile/componments/chart-form/index.vue @@ -3,7 +3,7 @@
性别分布
- +
@@ -11,17 +11,47 @@ - \ No newline at end of file diff --git a/src/views/business/staff/staff-profile/index.vue b/src/views/business/staff/staff-profile/index.vue index e7462a8..70d7abb 100644 --- a/src/views/business/staff/staff-profile/index.vue +++ b/src/views/business/staff/staff-profile/index.vue @@ -7,11 +7,11 @@ - -
- -
- +
+ + + +
@@ -59,5 +59,9 @@ export default { .staff-archives-chart { display: flex; flex-wrap: wrap; + justify-content: space-between; + > div { + width: 49.6%; + } } \ No newline at end of file