From c294262cdab88b805fab2f7122ad2c641b383707 Mon Sep 17 00:00:00 2001 From: yoe Date: Tue, 12 May 2020 16:02:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0echarts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 5 +++ index.html | 2 +- package-lock.json | 13 +++++++ package.json | 4 ++- src/main.js | 6 ++-- .../business/staff/staff-archives/index.vue | 34 +++++++++++++++++++ 6 files changed, 59 insertions(+), 5 deletions(-) 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 11f621b..a16ed7c 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,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 4231af7..9032a09 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,14 @@ "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", "babel-plugin-component": "0.10.1", "babel-polyfill": "6.26.0", + "echarts": "^4.7.0", "element-ui": "^2.13.1", "gulp": "3.9.1", "gulp-concat": "2.6.1", diff --git a/src/main.js b/src/main.js index 17c495d..7f74cd8 100644 --- a/src/main.js +++ b/src/main.js @@ -15,9 +15,9 @@ 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.$http = httpRequest // ajax请求方法 diff --git a/src/views/business/staff/staff-archives/index.vue b/src/views/business/staff/staff-archives/index.vue index 6f23797..ec8cb53 100644 --- a/src/views/business/staff/staff-archives/index.vue +++ b/src/views/business/staff/staff-archives/index.vue @@ -1,5 +1,39 @@ + + From c2e661b1a867d3422b7fbeb906b52ab8c2aad5b1 Mon Sep 17 00:00:00 2001 From: yoe Date: Tue, 12 May 2020 16:05:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20echarts=E6=8C=82=E8=BD=BD=E5=85=A8?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 2 ++ src/views/business/staff/staff-archives/index.vue | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index 7f74cd8..d3aa9f0 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,7 @@ 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' Vue.use(VueCookie) Vue.config.productionTip = false @@ -20,6 +21,7 @@ Vue.config.productionTip = false // } // 挂载全局 +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 ec8cb53..46b720f 100644 --- a/src/views/business/staff/staff-archives/index.vue +++ b/src/views/business/staff/staff-archives/index.vue @@ -6,8 +6,6 @@