调整加班情况统计（还未改完）

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,20 +1,20 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.20'
+var ip = '192.168.2.12'
 // var ip = '192.168.2.32'
 // var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    } 
-}
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     } 
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -283,6 +283,9 @@
                   <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable >
                     <el-option v-for="(item, index) in proList" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
                   </el-select>
+                  <el-select v-model="proJuctId" placeholder="请选择人员" @change="selcts()" clearable filterable>
+                    <el-option v-for="(item, index) in proList" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
+                  </el-select>
                 </div>
                 <div class="bianju">
                     <span class="demonstration">时间段</span>
@@ -293,6 +296,13 @@
                 <el-table-column prop="username" label="姓名" width="180"></el-table-column> 
                 <el-table-column prop="workingTime" label="加班时长" width="180"></el-table-column> 
                 <el-table-column prop="cost" label="成本" width="180"></el-table-column> 
+                <el-table-column prop="cost" label="操作" width="180">
+                    <template slot-scope="scope">
+                      <div>
+                        <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>
+                      </div>
+                    </template>  
+                </el-table-column> 
               </el-table>
             </div>
         <!--工具条-->
@@ -853,6 +863,10 @@ export default {
     },
     selcts() {
       this.overTime()
+    },
+    // 成本查看明细
+    costBtn(item) {
+      console.log(item, '明细')
     }
   },
 };