diff --git a/public/favicon.ico b/public/favicon.ico index 64d817f..49376c6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo-blue.png b/public/logo-blue.png deleted file mode 100644 index e0049c3..0000000 Binary files a/public/logo-blue.png and /dev/null differ diff --git a/public/res/template-box.xlsx b/public/res/template-box.xlsx deleted file mode 100644 index 5dd1686..0000000 Binary files a/public/res/template-box.xlsx and /dev/null differ diff --git a/public/res/template-tool.xlsx b/public/res/template-tool.xlsx deleted file mode 100644 index 96334d6..0000000 Binary files a/public/res/template-tool.xlsx and /dev/null differ diff --git a/public/res/template-user.xlsx b/public/res/template-user.xlsx deleted file mode 100644 index 43be0b9..0000000 Binary files a/public/res/template-user.xlsx and /dev/null differ diff --git a/src/assets/banshou.png b/src/assets/banshou.png deleted file mode 100644 index 0d978c1..0000000 Binary files a/src/assets/banshou.png and /dev/null differ diff --git a/src/assets/face.jpg b/src/assets/face.jpg new file mode 100644 index 0000000..408e320 Binary files /dev/null and b/src/assets/face.jpg differ diff --git a/src/assets/imgs/error-img.png b/src/assets/imgs/error-img.png deleted file mode 100644 index efe8ccb..0000000 Binary files a/src/assets/imgs/error-img.png and /dev/null differ diff --git a/src/assets/imgs/error.png b/src/assets/imgs/error.png deleted file mode 100644 index efe8ccb..0000000 Binary files a/src/assets/imgs/error.png and /dev/null differ diff --git a/src/assets/imgs/favicon.ico b/src/assets/imgs/favicon.ico deleted file mode 100644 index 9215c89..0000000 Binary files a/src/assets/imgs/favicon.ico and /dev/null differ diff --git a/src/assets/imgs/log.png b/src/assets/imgs/log.png deleted file mode 100644 index 8397330..0000000 Binary files a/src/assets/imgs/log.png and /dev/null differ diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png deleted file mode 100644 index 4238ba6..0000000 Binary files a/src/assets/imgs/logo.png and /dev/null differ diff --git a/src/assets/lantou.png b/src/assets/lantou.png deleted file mode 100644 index e1f26a0..0000000 Binary files a/src/assets/lantou.png and /dev/null differ diff --git a/src/assets/logo-blue.png b/src/assets/logo-blue.png deleted file mode 100644 index 6752080..0000000 Binary files a/src/assets/logo-blue.png and /dev/null differ diff --git a/src/assets/logo-mini-blue.png b/src/assets/logo-mini-blue.png deleted file mode 100644 index 71f6117..0000000 Binary files a/src/assets/logo-mini-blue.png and /dev/null differ diff --git a/src/assets/logo-mini.jpg b/src/assets/logo-mini.jpg new file mode 100644 index 0000000..ca43b6b Binary files /dev/null and b/src/assets/logo-mini.jpg differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png deleted file mode 100644 index 33fda49..0000000 Binary files a/src/assets/logo-mini.png and /dev/null differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 3374c7c..836e1a7 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/toolbox.png b/src/assets/toolbox.png deleted file mode 100644 index d84ac15..0000000 Binary files a/src/assets/toolbox.png and /dev/null differ diff --git a/src/assets/toolbox_on.png b/src/assets/toolbox_on.png deleted file mode 100644 index d9839ab..0000000 Binary files a/src/assets/toolbox_on.png and /dev/null differ diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index 96a7ba7..5366d7d 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -40,9 +40,9 @@ export default { // padding-top: 10px; font-weight: bold; font-size: 15px; - color: #122583; + color: #bf617c; white-space: nowrap; - border-bottom: 2px solid #122583; + border-bottom: 2px solid #bf617c; > span { position: relative; top: 2px; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bfcdc99..e9ea249 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -7,7 +7,7 @@
- +
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 603ff92..a58621c 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,10 +2,10 @@
- + - @@ -36,7 +36,7 @@ } .sidebar-name-logo { width: 120px; - height: 38px; + height: 28px; } .sidebarLogoFade-enter, diff --git a/src/settings.js b/src/settings.js index 4b997ba..9c6d750 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '智能工具箱管理平台', + title: '孕育邦', /** * @type {boolean} true | false diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 3fbc7c0..9aa0aa6 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,5 +1,5 @@ /* 改变主题色变量 */ -$--color-primary: #122583; +$--color-primary: #bf617c; /* 改变 icon 字体路径变量，必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 302d239..ff74359 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -18,7 +18,7 @@ bottom: 0; left: 0; z-index: 1001; - overflow: hidden; + overflow: visible; // reset element-ui css .horizontal-collapse-transition { @@ -87,7 +87,7 @@ //border-right: 5px solid $subMenuActiveText !important; } .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + // color: $subMenuActiveText !important; } diff --git a/src/styles/variables copy.scss b/src/styles/variables copy.scss deleted file mode 100644 index be55772..0000000 --- a/src/styles/variables copy.scss +++ /dev/null @@ -1,25 +0,0 @@ -// sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 - -$menuBg:#304156; -$menuHover:#263445; - -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; - -$sideBarWidth: 210px; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - menuText: $menuText; - menuActiveText: $menuActiveText; - subMenuActiveText: $subMenuActiveText; - menuBg: $menuBg; - menuHover: $menuHover; - subMenuBg: $subMenuBg; - subMenuHover: $subMenuHover; - sideBarWidth: $sideBarWidth; -} diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 9ee6e73..d566b3d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,19 +1,19 @@ // sidebar $menuText:#606266; -$menuActiveText:#122583; -$subMenuActiveText:#122583; //https://github.com/ElemeFE/element/issues/12951 +$menuActiveText:#ffffff; +$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951 $menuBg:#ffffff;//#304156 -$menuHover:#e0f2ff; -$menuActiveBg:#1ea946; +$menuHover:#e5a5b8; +$menuActiveBg:#bf617c; $subMenuBg:#ffffff;//#1f2d3d -$subMenuHover:#edf6ff; -$submenuActiveBg:#1ea946; +$subMenuHover:#e5a5b8; +$submenuActiveBg:#bf617c; $sideBarWidth: 210px; -$primaryColor: #122583; +$primaryColor: #bf617c; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index b984936..c9d5742 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -1,4 +1,4 @@ @import '~view-design/src/styles/index.less'; // Here are the variables to cover, such as: -@primary-color: #122583; +@primary-color: #bf617c; diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5fd9de6..4cdb9f9 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,68 +1,6 @@ @@ -143,11 +81,7 @@ } }, created: function() { - this.loadCounts(); - this.loadStat("warning", "week"); - this.loadStat("exception", "week"); - this.loadStat("tool_operation", "week"); - this.loadStat("client_touch", "week"); + }, methods: { changeDate: function(type, date, index) {