1

js/service/person.js

@@ -6,83 +6,84 @@
 var ServicePerson={
     // 仓库人员
     getWarehousePersonList:function(){
+        return getService.methodGet("/workingStatistics/fbsWorkingStatistics/getFilePersonList?code=warehouse");
 
         // return getService.methodPost("/fbsPerson/fbsPerson/getWarehousePersonList");
 
-        const personList = [];
-        personList.push({
-            realName:"李白",
-            inTime:"09:11",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_1.jpg"
-        });
-        personList.push({
-            realName:"里斯",
-            inTime:"09:14",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_5.jpg"
-        });
-        personList.push({
-            realName:"杜普",
-            inTime:"09:12",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_2.jpg"
-        });
-        personList.push({
-            realName:"李牧",
-            inTime:"09:10",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_3.jpg"
-        });
-        personList.push({
-            realName:"杜普",
-            inTime:"09:12",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_2.jpg"
-        });
-        personList.push({
-            realName:"范仲淹",
-            inTime:"09:15",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_4.jpg"
-        });
-        personList.push({
-            realName:"杜普",
-            inTime:"09:12",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_2.jpg"
-        });
-        personList.push({
-            realName:"里斯",
-            inTime:"09:14",
-            warehouseId:"0001",
-            warehouseName:"A仓库",
-            classId:"0001",
-            className:"A班",
-            avatar:"/images/avatar/avata_5.jpg"
-        });
-        return personList;
+        // const personList = [];
+        // personList.push({
+        //     realName:"李白",
+        //     inTime:"09:11",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_1.jpg"
+        // });
+        // personList.push({
+        //     realName:"里斯",
+        //     inTime:"09:14",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_5.jpg"
+        // });
+        // personList.push({
+        //     realName:"杜普",
+        //     inTime:"09:12",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_2.jpg"
+        // });
+        // personList.push({
+        //     realName:"李牧",
+        //     inTime:"09:10",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_3.jpg"
+        // });
+        // personList.push({
+        //     realName:"杜普",
+        //     inTime:"09:12",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_2.jpg"
+        // });
+        // personList.push({
+        //     realName:"范仲淹",
+        //     inTime:"09:15",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_4.jpg"
+        // });
+        // personList.push({
+        //     realName:"杜普",
+        //     inTime:"09:12",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_2.jpg"
+        // });
+        // personList.push({
+        //     realName:"里斯",
+        //     inTime:"09:14",
+        //     warehouseId:"0001",
+        //     warehouseName:"A仓库",
+        //     classId:"0001",
+        //     className:"A班",
+        //     avatar:"/images/avatar/avata_5.jpg"
+        // });
+        // return personList;
     },
     // 人员月出勤率,考勤人数，总人数
     getMonthAttendance:function(){
@@ -159,7 +160,7 @@ var ServicePerson={
         //     className:"A班",
         //     avatar:"/images/avatar/avata_5.jpg"
         // });
-        return getService.methodPost("/fbsPerson/fbsPerson/getWarehousePersonList");
+        return getService.methodGet("/workingStatistics/fbsWorkingStatistics/getFilePersonList?code=productLines");
     },
 
 }

pages/dashboard/line.html

@@ -45,17 +45,17 @@
 
                     <div class="col-lg-12  col-md-12 center block-title">班组装人员信息</div>
                 </div>
-                <div class="row" style="height: 150px;">
-                    <div class="person-div" v-for="user in userList">
+                <div class="row" style="height: 160px;">
+                    <div class="person-div" v-for="user in userList" style="text-align: center;margin-left:5%;">
                         <div>
-                            <img v-bind:src="user.avatar" border="0" />
+                            <img v-bind:src="'/upPersonnel/productLines/'+user.fileName" border="0" />
                         </div>
-                        <div class="center">
-                            {{user.className}}
+                        <div style="width: 90px; overflow:hidden; word-break:break-all;white-space:nowrap">
+                            {{user.fileRealName}}
                         </div>
-                        <div class="center">
+                        <!-- <div class="center">
                             {{user.realName}}&nbsp;&nbsp;{{user.inTime}}
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="row block-padding">
@@ -262,7 +262,7 @@
                     const userList = ServicePerson.getWorkPersonList();
                     this.cacheDataObject.userList = {
                         data: userList,
-                        pagesize: 5,
+                        pagesize: 4,
                         pageindex: 0
                     }
                     this.userList = userList.slice(0, this.cacheDataObject.userList.pagesize);

pages/dashboard/warehouse.html

@@ -51,17 +51,17 @@
                         <span class="block-title-important">{{userSum}}</span>
                     </div>
                 </div>
-                <div class="row"  style="height: 20%;">
-                    <div class="person-div" v-for="user in userList" style="text-align: center;margin-left:7%;">
+                <div class="row"  style="height: 20%;min-height: 160px;">
+                    <div class="person-div" v-for="user in userList" style="text-align: center;margin-left:5%;">
                         <div>
-                            <img v-bind:src="user.avatar" border="0" />
+                            <img v-bind:src="'/upPersonnel/warehouse/'+user.fileName" border="0" />
                         </div>
-                        <div>
-                            {{user.warehouseName}}&nbsp;&nbsp;{{user.className}}
-                        </div>
-                        <div>
-                            {{user.realName}}&nbsp;&nbsp;{{user.inTime}}
+                        <div style="width: 100px; overflow:hidden; word-break:break-all;white-space:nowrap">
+                            {{user.fileRealName}}
                         </div>
+                        <!-- <div>
+                            {{user.fileName}}&nbsp;&nbsp;{{user.fileName}}
+                        </div> -->
                     </div>
                 </div>
                 <!--收料待检-->