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

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,7 +4,7 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-var ip = '47.100.37.243'
+var ip = '47.100.37.243' 
 // var ip = '192.168.2.136'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -19,7 +19,7 @@
                     <span class="el-dropdown-link userinfo-inner">
                         <i class="el-icon-user" style="font-size:18px" ></i>
                         咨询客服
-                    </span>
+                    </span> 
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item >
                             <div>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -533,7 +533,7 @@
         <!-- 按周填报弹窗 -->
         <el-dialog title="请填写" :visible.sync="tianxieDialogVisible" width="30%" :before-close="handleClose">
             <div>
-                <div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length> 0">
+                <div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length > 0">
                     <p>子项目</p>
                     <el-select v-model="zhoBao.subProjectId" placeholder="请选择" clearable="true" style="width: 355px">
                         <el-option v-for="item in zhoBao.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>