提交

2021-10-29 14:29:56 +08:00
parent 03043f1c6d
commit a406049ee6
7 changed files with 23 additions and 6 deletions
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-10-11 16:38:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-10-29 09:11:29
+ * @Description:
+ */
 'use strict'
 const utils = require('./utils')
 const webpack = require('webpack')
@@ -54,6 +61,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
    // https://github.com/ampedandwired/html-webpack-plugin
    new HtmlWebpackPlugin({
      filename: 'index.html',
+      favicon: path.resolve('./src/assets/logo.png'),
      template: 'index.html',
      inject: true
    }),
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -46,7 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, {
      filename: utils.assetsPath('css/[name].[contenthash].css'),
      // Setting the following option to `false` will not extract CSS from codesplit chunks.
      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
      allChunks: true,
    }),
@@ -63,6 +63,7 @@ const webpackConfig = merge(baseWebpackConfig, {
    new HtmlWebpackPlugin({
      filename: config.build.index,
      template: 'index.html',
+      favicon: path.resolve('./src/assets/logo.png'),
      inject: true,
      minify: {
        removeComments: true,
--- a/index.html
+++ b/index.html
@@ -1,9 +1,17 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-10-11 16:38:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-10-29 09:09:05
+ * @Description:
+-->
 <!DOCTYPE html>
 <html>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>mt-yj-wms-ui</title>
+    <title>云洁科技</title>
+    <link rel="shortcut icon" type="image/x-icon" href="./src/assets/logo.png">
  </head>
  <body>
    <div id="app"></div>
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/assets/yj.svg
+++ b/src/assets/yj.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2196.8 2196.8"><defs><style>.cls-1{fill:#dc0606;}.cls-2{fill:#fff;}</style></defs><title>资源 15</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><rect class="cls-1" width="2196.8" height="2196.8" rx="254.99"/><polygon class="cls-2" points="1291.43 634.33 1065.93 634.33 791.87 1046.39 785.47 1046.39 511.4 634.33 285.9 634.33 664.9 1204.16 664.9 1682.84 914.61 1682.84 914.61 1200.88 1291.43 634.33"/><path class="cls-2" d="M1453.17,1687.63c-2.71,0-5.41,0-8.15-.06-2.12,0-4.26,0-6.36,0-102.32,0-184.27-29-243.7-86.19-30.41-29.27-55.06-66.23-73.27-109.85-17.61-42.18-29.66-91.75-35.82-147.35l-3.57-32.31L1301,1258.59l1.23,45.8c2,73.91,18.1,125.58,47.89,153.57,21.08,19.81,50.12,28.77,88.82,27.4l1.31,0,1.31,0c37.21,1.32,64.84-7.41,84.5-26.68,29.49-28.9,43.83-83.51,42.62-162.31V629.54h221.42v668.4c.87,66.93-6.41,126.06-21.65,175.79-15.92,52-41,95.23-74.38,128.6C1637.35,1659,1556.31,1687.63,1453.17,1687.63Z"/></g></g></svg>
--- a/src/components/main.vue
+++ b/src/components/main.vue
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2021-10-12 13:49:08
 * @LastEditors: zwq
- * @LastEditTime: 2021-10-26 14:38:01
+ * @LastEditTime: 2021-10-29 09:41:21
 * @Description:
 -->
 <template>
  <el-container style="padding:20px">
    <el-aside style="width:200px;height:calc(100vh - 60px)">
      <div style="width:199px;height:70px;margin-bottom:2px;background-color:#545c64">
-        <i class="el-icon-set-up" style="font-size: 42px;color:white;line-height:70px;"></i>
+        <img src="../assets/logo.png" width="50" height="50" style="margin:10px 0px 10px 10px;float:left"/><div style="color:white;padding-top:10px;font-size:20px">云 洁 科 技<br><span style="font-size:10px">YUN JIE TECHNOLOGY</span></div>
      </div>
      <el-menu
        :default-active="activeIndex"
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-10-11 08:46:56
 * @LastEditors: zwq
- * @LastEditTime: 2021-10-12 13:41:36
+ * @LastEditTime: 2021-10-29 09:59:12
 * @Description:
 */
 // The Vue build version to load with the `import` command
@@ -16,7 +16,6 @@ import axios from 'axios'


 //axios.defaults.baseURL = 'http://192.168.1.188:8009'
-//axios.defaults.headers.post['Content-Type'] = 'text/plain'
 Vue.prototype.$axios = axios
 Vue.config.productionTip = false
 Vue.use(ElementUI);
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2196.8 2196.8"><defs><style>.cls-1{fill:#dc0606;}.cls-2{fill:#fff;}</style></defs><title>资源 15</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><rect class="cls-1" width="2196.8" height="2196.8" rx="254.99"/><polygon class="cls-2" points="1291.43 634.33 1065.93 634.33 791.87 1046.39 785.47 1046.39 511.4 634.33 285.9 634.33 664.9 1204.16 664.9 1682.84 914.61 1682.84 914.61 1200.88 1291.43 634.33"/><path class="cls-2" d="M1453.17,1687.63c-2.71,0-5.41,0-8.15-.06-2.12,0-4.26,0-6.36,0-102.32,0-184.27-29-243.7-86.19-30.41-29.27-55.06-66.23-73.27-109.85-17.61-42.18-29.66-91.75-35.82-147.35l-3.57-32.31L1301,1258.59l1.23,45.8c2,73.91,18.1,125.58,47.89,153.57,21.08,19.81,50.12,28.77,88.82,27.4l1.31,0,1.31,0c37.21,1.32,64.84-7.41,84.5-26.68,29.49-28.9,43.83-83.51,42.62-162.31V629.54h221.42v668.4c.87,66.93-6.41,126.06-21.65,175.79-15.92,52-41,95.23-74.38,128.6C1637.35,1659,1556.31,1687.63,1453.17,1687.63Z"/></g></g></svg>