up

src/components/LxHeader/index.vue

@@ -1,64 +1,73 @@
-<template>
+<template>
-  <div class="v-header">
+  <div class="v-header">
-    <div class="v-left-text">
+    <div class="v-left-text" :style="{color:variables.primaryColor,
-      <Icon size="20" :type="icon" />
+    'border-bottom': '2px solid'+ variables.primaryColor}">
-      <span>{{text}}</span>
+      <Icon size="20" :type="icon" />
-    </div>
+      <span>{{text}}</span>
-    <div class="content">
+    </div>
-      <slot name="content"></slot>
+    <div class="content">
-    </div>
+      <slot name="content"></slot>
-  <!--  <div class="v-right-content">
+    </div>
-      <slot></slot>
+    <!--  <div class="v-right-content">
-    </div> -->
+      <slot></slot>
-    <div class="selerchcontent">
+    </div> -->
-      <slot ></slot>
+    <div class="selerchcontent">
-    </div>
+      <slot></slot>
-  </div>
+    </div>
-</template>
+  </div>
-<script>
+</template>
-export default {
+<script>
-  props: {
+  import variables from '@/styles/variables.scss'
-    icon: {
+  export default {
-      type: String,
+    props: {
-      default: ""
+      icon: {
-    },
+        type: String,
-    text: {
+        default: ""
-      type: String,
+      },
-      default: "未定义名称"
+      text: {
-    }
+        type: String,
-  }
+        default: "未定义名称"
-};
+      }
-</script>
+    },
-<style lang="less" scoped>
+    computed: {
-.v-header {
+      variables() {
-  display: flex;
+        return variables
-  border-bottom: 1px solid #dcdee2;
+      }
-  flex-direction: column;
+    }
-  .v-left-text {
+  };
-    margin-top: 3px;
+</script>
-    padding-bottom: 6px;
+<style lang="less" scoped>
-    // padding-top: 10px;
+  .v-header {
-    font-weight: bold;
+    display: flex;
-    font-size: 15px;
+    border-bottom: 1px solid #dcdee2;
-    color: #122583;
+    flex-direction: column;
-    white-space: nowrap;
+
-    border-bottom: 2px solid #122583;
+    .v-left-text {
-    > span {
+      margin-top: 3px;
-      position: relative;
+      padding-bottom: 6px;
-      top: 2px;
+      // padding-top: 10px;
-    }
+      font-weight: bold;
-  }
+      font-size: 15px;
-  .content {
+      white-space: nowrap;
-    line-height: 25px;
+
-    padding-left: 10px;
+      >span {
-    padding: 6px 0 0 10px;
+        position: relative;
-  }
+        top: 2px;
-  .v-right-content {
+      }
-      flex: 1;
+    }
-  }
+
-
+    .content {
-  .selerchcontent{
+      line-height: 25px;
-      flex: 1;
+      padding-left: 10px;
-  }
+      padding: 6px 0 0 10px;
-}
+    }
+
+    .v-right-content {
+      flex: 1;
+    }
+
+    .selerchcontent {
+      flex: 1;
+    }
+  }
 </style>

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/imgs/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="false" src="../../../assets/logo-mini.png?v=1" 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="false" src="../../../assets/logo-mini.png" class="sidebar-logo"> <img src="../../../assets/logo-mini.png"
           class="sidebar-name-logo" />
       </router-link>
     </transition>
@@ -23,7 +23,7 @@
     },
     data() {
       return {
-        title: '智能工具箱管理平台',
+        title: '泵故障监测云平台',
         logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
       }
     }
@@ -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: #0a729b;
 
 /* 改变 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.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:#70a1b4;
-$menuActiveBg:#1ea946;
+$menuActiveBg:#0a729b;
 
 
 $subMenuBg:#ffffff;//#1f2d3d
-$subMenuHover:#edf6ff;
+$subMenuHover:#70a1b4;
-$submenuActiveBg:#1ea946;
+$submenuActiveBg:#0a729b;
 
 $sideBarWidth: 210px;
-$primaryColor: #122583;
+$primaryColor: #0a729b;
 // 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: #0a729b;

src/views/login/index.vue

@@ -9,7 +9,7 @@
       label-position="left">
 
       <div class="title-container">
-        <h3 class="title">朗业前端初始化界面</h3>
+        <h3 class="title">“赛特勒”泵故障监测云平台</h3>
       </div>
 
       <el-form-item prop="username">

src/views/system/menu.vue

@@ -118,11 +118,6 @@
             message: '请输入菜单路径',
             trigger: 'blur'
           }],
-          icon: [{
-            required: true,
-            message: '请输入图标',
-            trigger: 'blur'
-          }],
           visible: [{
             required: true,
             message: '请选择是否显示',

vue.config.js

@@ -6,14 +6,14 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '朗业初始化项目' // page title
+const name = defaultSettings.title || '泵故障监测云平台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.
 // For example, Mac: sudo npm run
 // You can change the port by the following methods:
 // port = 9528 npm run dev OR npm run dev --port = 9528
-const port = process.env.port || process.env.npm_config_port || 8001 // dev port
+const port = process.env.port || process.env.npm_config_port || 8018 // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -46,7 +46,7 @@ module.exports = {
     //before: require('./mock/mock-server.js'),
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://118.31.104.155:8082/',
+        target: 'http://saitele-pump.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''