diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..6342e565 Binary files /dev/null and b/.DS_Store differ diff --git a/report-ui/build/webpack.dev.conf.js b/report-ui/build/webpack.dev.conf.js index cfc157ab..ec13875c 100644 --- a/report-ui/build/webpack.dev.conf.js +++ b/report-ui/build/webpack.dev.conf.js @@ -61,7 +61,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('static/favicon.ico'), title: 'vue-admin-template' }) ] diff --git a/report-ui/build/webpack.prod.conf.js b/report-ui/build/webpack.prod.conf.js index 920a7f26..5fff5908 100644 --- a/report-ui/build/webpack.prod.conf.js +++ b/report-ui/build/webpack.prod.conf.js @@ -60,7 +60,7 @@ const webpackConfig = merge(baseWebpackConfig, { filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('static/favicon.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/report-ui/favicon.ico b/report-ui/favicon.ico deleted file mode 100644 index 1f80c113..00000000 Binary files a/report-ui/favicon.ico and /dev/null differ diff --git a/report-ui/src/views/home/index.vue b/report-ui/src/views/home/index.vue index 89018a78..a70e6a3d 100644 --- a/report-ui/src/views/home/index.vue +++ b/report-ui/src/views/home/index.vue @@ -1,9 +1,5 @@