Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/octopus/config/index.js

@@ -1,7 +1,7 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.10'
+var ip = '192.168.2.13'
 // var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

fhKeeper/formulahousekeeper/octopus/src/views/Home.vue

@@ -2,9 +2,9 @@
     <el-row class="container">
         <el-col :span="24" class="header">
             <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'" :style="collapsed?'padding:0':''">
-                <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
+                <img v-if="collapsed" class="headImg" src="../assets/image/logo_zyg.png" />
                 <div v-else class="logo-sys">
-                    <img class="headImg" src="../assets/image/head_logo.png" />
+                    <img class="headImg" src="../assets/image/logo_zyg.png" />
                     <span>{{sysName}}</span>
                 </div>
             </el-col>

fhKeeper/formulahousekeeper/octopus/src/views/Login.vue

@@ -3,9 +3,9 @@
         <div class="login-par">
             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="left" label-width="0px" class="demo-ruleForm login-container">
                 <div class="login-logo">
-                    <img src="../assets/image/login_logo.png" style="width:80px;height:80px;"/>
+                    <img src="../assets/image/logo_zyg.png" style="width:80px;height:80px;"/>
                 </div>
-                <h3 class="title">工时管家</h3>
+                <h3 class="title">八爪鱼</h3>
                 <el-form-item class="login-input" prop="username">
                     <el-input type="text" v-model="ruleForm.username" autocomplete="off" placeholder="账号" clearable prefix-icon="el-icon-user-solid"></el-input>
                 </el-form-item>
@@ -347,7 +347,7 @@
                 background: #fff;
                 border: 1px solid #eaeaea;
                 box-shadow: 0 0 5px #cac6c6;
-                border-top: 10px solid #20a0ff;
+                border-top: 10px solid #606266;
                 margin:auto;
                 .title {
                     font-size: 20px;