From 2dcd263417e93ec14e212ec4fb24d2f5ed2f8cb0 Mon Sep 17 00:00:00 2001 From: zicla Date: Mon, 1 Apr 2019 01:55:23 +0800 Subject: [PATCH] Revert to the normal version. --- .babelrc | 2 +- .eslintignore | 1 - build/webpack.base.conf.js | 7 ------- config/index.js | 3 ++- index.html | 7 +------ package.json | 2 -- src/App.vue | 3 +-- src/assets/css/app.less | 4 ++-- src/backyard/dashboard/Index.vue | 35 ++++++++++++++++---------------- src/common/router/index.js | 30 +++++++++++++-------------- src/main.js | 4 ++++ 11 files changed, 43 insertions(+), 55 deletions(-) diff --git a/.babelrc b/.babelrc index c01b06b..c06df4d 100644 --- a/.babelrc +++ b/.babelrc @@ -8,7 +8,7 @@ }], "stage-2" ], - "plugins": ["transform-runtime","babel-plugin-syntax-dynamic-import"], + "plugins": ["transform-runtime"], "env": { "test": { "presets": ["env", "stage-2"], diff --git a/.eslintignore b/.eslintignore index 71acc5c..f5dd392 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,7 +3,6 @@ /dist/ /static/ /*.js -/*.vue src/common/fork/* diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 88d3274..f7daa67 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -12,10 +12,6 @@ module.exports = { entry: { app: './src/main.js' }, - externals:{ - 'vue':'Vue', - 'element-ui':'ELEMENT' - }, output: { path: config.build.assetsRoot, filename: '[name].js', @@ -49,9 +45,6 @@ module.exports = { { test: /\.js$/, loader: 'babel-loader', - options:{ - plugins:['babel-plugin-syntax-dynamic-import'] - }, include: [resolve('src'), resolve('test'), resolve('node_modules/vue-echarts'), diff --git a/config/index.js b/config/index.js index 31681f6..0071db3 100644 --- a/config/index.js +++ b/config/index.js @@ -33,7 +33,8 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'https://tank.eyeblue.cn', + //target: 'https://tank.eyeblue.cn', + target: 'http://127.0.0.1:6010', changeOrigin: true, pathRewrite: { '^/api': '/api' diff --git a/index.html b/index.html index 092f884..2bd756a 100644 --- a/index.html +++ b/index.html @@ -9,15 +9,10 @@ - - - +
- - - diff --git a/package.json b/package.json index 66d829e..fc9d40b 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "icheck": "^1.0.2", "jquery": "^3.2.1", "perfect-scrollbar": "^1.1.0", - "resize-detector": "^0.1.10", "scriptjs": "^2.5.8", "swiper": "^4.0.3", "velocity-animate": "^1.5.0", @@ -45,7 +44,6 @@ "babel-eslint": "^7.1.1", "babel-loader": "^7.1.1", "babel-plugin-istanbul": "^4.1.1", - "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-runtime": "^6.22.0", "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", diff --git a/src/App.vue b/src/App.vue index febabf5..dfaf29b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,6 @@