up

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;

src/layout/components/Navbar.vue

@@ -7,7 +7,7 @@
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+          <img src="../../assets/face.jpg" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">

src/layout/components/Sidebar/Logo.vue

@@ -2,10 +2,10 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../assets/logo-mini-blue.png?v=1" class="sidebar-logo">
+        <img v-if="logo" src="../../../assets/logo-mini.jpg" class="sidebar-logo">
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../assets/logo-mini-blue.png" class="sidebar-logo"> <img src="/logo-blue.png?v=1"
+        <img v-if="logo" src="../../../assets/logo-mini.jpg" class="sidebar-logo"> <img src="../../../assets/logo.png"
           class="sidebar-name-logo" />
       </router-link>
     </transition>
@@ -36,7 +36,7 @@
   }
   .sidebar-name-logo {
     width: 120px;
-    height: 38px;
+    height: 28px;
   }
 
   .sidebarLogoFade-enter,

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '智能工具箱管理平台',
+  title: '孕育邦',
 
   /**
    * @type {boolean} true | false

src/styles/element-variables.scss

@@ -1,5 +1,5 @@
 /* 改变主题色变量 */
-$--color-primary: #122583;
+$--color-primary: #bf617c;
 
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

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;
         }
 
 

src/styles/variables copy.scss

@@ -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;
-}

src/styles/variables.scss

@@ -1,19 +1,19 @@
 // sidebar
 $menuText:#606266;
-$menuActiveText:#122583;
+$menuActiveText:#ffffff;
-$subMenuActiveText:#122583; //https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951
 
 $menuBg:#ffffff;//#304156
-$menuHover:#e0f2ff;
+$menuHover:#e5a5b8;
-$menuActiveBg:#1ea946;
+$menuActiveBg:#bf617c;
 
 
 $subMenuBg:#ffffff;//#1f2d3d
-$subMenuHover:#edf6ff;
+$subMenuHover:#e5a5b8;
-$submenuActiveBg:#1ea946;
+$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 {

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;

src/views/dashboard/index.vue

@@ -1,68 +1,6 @@
 <template>
   <div class="dashboard-editor-container">
 
-    <panel-group @handleRoute="handleRoute" :countsData="countsData" />
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="12">
-        <div class="chart-wrapper">
-          <div class="chart-title">
-            <router-link to="/toolbox/warning">预警统计</router-link>
-            <div>
-              <el-tag @click="changeDate('warning',item.type,index)" :type="(item.checked?'success':'info')"
-                style="margin-right: 10px;cursor: pointer;" v-for="(item,index) in stat.warning.dateRange">
-                {{item.name}}
-              </el-tag>
-            </div>
-          </div>
-          <bar-chart :chartData="stat.warning" />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="12">
-        <div class="chart-wrapper">
-          <div class="chart-title">
-            <router-link to="/toolbox/exception">异常统计</router-link>
-            <div>
-              <el-tag @click="changeDate('exception',item.type,index)" :type="(item.checked?'success':'info')"
-                style="margin-right: 10px;cursor: pointer;" v-for="(item,index) in stat.exception.dateRange">
-                {{item.name}}
-              </el-tag>
-            </div>
-          </div>
-          <bar-chart :chartData="stat.exception" />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="12">
-        <div class="chart-wrapper">
-          <div class="chart-title">
-
-            <router-link to="/toolbox/log">工具箱操作统计</router-link>
-            <div>
-              <el-tag @click="changeDate('client_touch',item.type,index)" :type="(item.checked?'success':'info')"
-                style="margin-right: 10px;cursor: pointer;" v-for="(item,index) in stat.client_touch.dateRange">
-                {{item.name}}
-              </el-tag>
-            </div>
-          </div>
-          <bar-chart :chartData="stat.client_touch" />
-        </div>
-      </el-col>
-
-      <el-col :xs="24" :sm="24" :lg="12">
-        <div class="chart-wrapper">
-          <div class="chart-title">
-            <router-link to="/tool/log">工具操作统计</router-link>
-            <div>
-              <el-tag @click="changeDate('tool_operation',item.type,index)" :type="(item.checked?'success':'info')"
-                style="margin-right: 10px;cursor: pointer;" v-for="(item,index) in stat.tool_operation.dateRange">
-                {{item.name}}
-              </el-tag>
-            </div>
-          </div>
-          <bar-chart :chartData="stat.tool_operation" />
-        </div>
-      </el-col>
-    </el-row>
-
   </div>
 </template>
 
@@ -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) {