diff --git a/.env.oms b/.env.oms index b893c1c6..129a6343 100644 --- a/.env.oms +++ b/.env.oms @@ -1,2 +1,4 @@ VUE_APP_SCOPE=oms VUE_APP_API=http://192.168.1.87:19897 +VUE_APP_IS_SIMPLE_SERVER=1 +VUE_APP_PORT=19897 diff --git a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue new file mode 100644 index 00000000..53ca6ee5 --- /dev/null +++ b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue new file mode 100644 index 00000000..dfb2fc70 --- /dev/null +++ b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss index 312042e2..bc76fefa 100644 --- a/ui/lib/styles/common.scss +++ b/ui/lib/styles/common.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; @each $v in (8, 10, 12, 14, 16, 20, 24, 27, 32, 48, 56, 64, 80) { //gap .gap-#{$v} { - gap: #{$v}px + gap: #{$v}px !important; } .font-#{$v} { font-size: #{$v}px; diff --git a/vue.config.js b/vue.config.js index 81f1d4cf..5eae659c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,6 @@ const path = require('path'); const proxy = process.env.VUE_APP_API || "http://192.168.1.87:9000" +const port = process.env.VUE_APP_PORT || 7000 module.exports = { lintOnSave: false, productionSourceMap: false, @@ -13,19 +14,19 @@ module.exports = { transpileDependencies: [/dui[\\\/]lib[\\\/]js/], chainWebpack: (config) => { config.module - .rule('js') - .include - .add(path.resolve(__dirname, 'packages')) - .add(path.resolve(__dirname, 'components')) - .add(path.resolve(__dirname, 'project')) - .add(path.resolve(__dirname, 'examples')) - .add(path.resolve(__dirname, 'ui')) - .end().use('babel').loader('babel-loader').tap(options => options); + .rule('js') + .include + .add(path.resolve(__dirname, 'packages')) + .add(path.resolve(__dirname, 'components')) + .add(path.resolve(__dirname, 'project')) + .add(path.resolve(__dirname, 'examples')) + .add(path.resolve(__dirname, 'ui')) + .end().use('babel').loader('babel-loader').tap(options => options); config.plugin("limit").use(require("webpack/lib/optimize/LimitChunkCountPlugin"), [{maxChunks: 20}]).tap(options => options) }, devServer: { host: '0.0.0.0', //主机地址 - port: 7000, //端口号 + port, //端口号 open: true, proxy: { //设置代理,可解决跨