产线 品质

js/service.js

@@ -2,8 +2,8 @@
  * 基本服务器交互类
  */
 var ServiceOperation = {
-  BaseUrl: "http://10.10.0.69:10022/FBS_MES/",
-  //BaseUrl: "http://127.0.0.1:8088/FBS_MES/",
+  // BaseUrl: "http://10.10.0.69:10022/FBS_MES/",
+  BaseUrl: "http://127.0.0.1:8088/FBS_MES/",
   MethodPost: "POST", // post请求
   MethodPut: "PUT", // put请求
   MethodGet: "GET", // get请求

js/service/material.js

@@ -625,14 +625,15 @@ var ServiceMaterial={
     },
     // 当月供应商合格率
     getPassRateByVendor: function () {
-        return {
-            "供应商A":98,
-            "供应商B":95,
-            "供应商C":94,
-            "供应商D":93,
-            "供应商E":99,
-            "供应商F":97
-        }
+        // return {
+        //     "供应商A":98,
+        //     "供应商B":95,
+        //     "供应商C":94,
+        //     "供应商D":93,
+        //     "供应商E":99,
+        //     "供应商F":97
+        // }
+        return MethodGetService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getPassRateByVendor");
     },
     // 当月检验合格率
     getCheckRateByBatchno: function () {

js/service/produce-task.js

@@ -378,19 +378,27 @@ var ServiceProduceTask = {
         let taskList=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getDoingListByOrder");
         taskList.forEach(element => {
             element.materialName=element.product;
-            element.specs=element.cinvstd;
+            if(element.cinvstd){
+                element.specs=element.cinvstd;
+            }else{
+                element.specs="";
+            }
             element.planSum=element.numberOfTasks;
             if(element.qualifiedNumber){
                 element.completeSum=element.qualifiedNumber;
             }else{
-                element.completeSum=0
+                element.completeSum=0;
             }
-           
             element.projectName=element.productionOrderNumberName;
             element.orderCode=element.productionOrderNumberName;
-            element.planCompleteDate=element.endDate;
+            if(element.endDate){
+                element.planCompleteDate=element.endDate;
+            }else{
+                element.planCompleteDate="";
+            }
+           
         });
-        console.log(taskList)
+        console.log(JSON.parse(JSON.stringify(taskList)) );
         $.each(taskList, function (index, item) {
             item.incompleteSum = item.planSum - item.completeSum;
             if (item.incompleteSum < 0)

js/service/product.js

@@ -195,7 +195,8 @@ var ServiceProduct = {
     },
     // 日生产效率
     getDayProduceRate: function () {
-        const rate = 90;
+        // const rate = 90;
+        rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
         return {
             name: "生产效率",
             value: rate
@@ -204,55 +205,57 @@ var ServiceProduct = {
     },
     // 某日产品良数量
     getDayGood: function () {
-        const list = [];
-        list.push({
-            label: "产品A",
-            sum1: 48,
-            sum2: 50
-        });
-        list.push({
-            label: "产品B",
-            sum1: 80,
-            sum2: 90
-        });
-        list.push({
-            label: "产品C",
-            sum1: 47,
-            sum2: 50
-        });
-        list.push({
-            label: "产品D",
-            sum1: 40,
-            sum2: 50
-        });
-        list.push({
-            label: "产品E",
-            sum1: 42,
-            sum2: 50
-        });
-        list.push({
-            label: "产品F",
-            sum1: 44,
-            sum2: 50
-        });
-        list.push({
-            label: "产品G",
-            sum1: 45,
-            sum2: 50
-        });
-        return list;
+        // const list = [];
+        // list.push({
+        //     label: "产品A",
+        //     sum1: 48,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品B",
+        //     sum1: 80,
+        //     sum2: 90
+        // });
+        // list.push({
+        //     label: "产品C",
+        //     sum1: 47,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品D",
+        //     sum1: 40,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品E",
+        //     sum1: 42,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品F",
+        //     sum1: 44,
+        //     sum2: 50
+        // });
+        // list.push({
+        //     label: "产品G",
+        //     sum1: 45,
+        //     sum2: 50
+        // });
+        // return list;
+        return MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getRejectsNumber?type=1");
     },
     // 日质量异常，根据分类
     getDayExceptionByCategory: function () {
-        return {
-            "分类A": 600,
-            "分类B": 500,
-            "分类C": 300,
-            "分类D": 200,
-            "分类E": 100,
-            "分类F": 200,
-            "分类G": 400
-        };
+        // return {
+        //     "分类A": 600,
+        //     "分类B": 500,
+        //     "分类C": 300,
+        //     "分类D": 200,
+        //     "分类E": 100,
+        //     "分类F": 200,
+        //     "分类G": 400
+        // };
+        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getAbnormalHoursMonthReport?type=1");
     },
     
 

js/service/workhour.js

@@ -16,12 +16,13 @@ var ServiceWorkhour={
     },
     // 当天根据物料统计
     getDayByMaterial:function(){
-        return {
-            "物料A":150,
-            "物料B":250,
-            "物料C":200,
-            "物料D":400,
-        };
+        // return {
+        //     "物料A":150,
+        //     "物料B":250,
+        //     "物料C":200,
+        //     "物料D":400,
+        // };
+        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductHoursMonthReport?type=1");
     },
     // 获取物料的标准工时和实际工时
     getStandAndRealByMaterial:function(){
@@ -49,21 +50,31 @@ var ServiceWorkhour={
     },
     // 获取当日物料的标准工时和实际工时
     getDayStandAndRealByMaterial:function(){
-        const list = [];
-        list.push({productName:"产品A",standHour:15,realHour:20});
-        list.push({productName:"产品B",standHour:14,realHour:10});
-        list.push({productName:"产品C",standHour:18,realHour:17});
-        list.push({productName:"产品D",standHour:16,realHour:19});
-        list.push({productName:"产品E",standHour:13,realHour:12});
-        list.push({productName:"产品F",standHour:12,realHour:12});
-        list.push({productName:"产品G",standHour:17,realHour:20});
+        // const list = [];
+        // list.push({productName:"产品A",standHour:15,realHour:20});
+        // list.push({productName:"产品B",standHour:14,realHour:10});
+        // list.push({productName:"产品C",standHour:18,realHour:17});
+        // list.push({productName:"产品D",standHour:16,realHour:19});
+        // list.push({productName:"产品E",standHour:13,realHour:12});
+        // list.push({productName:"产品F",standHour:12,realHour:12});
+        // list.push({productName:"产品G",standHour:17,realHour:20});
+
+        // $.each(list, function(index,item){
+        //     item.label = item.productName;
+        //     item.label1 = "标准工时";
+        //     item.sum1 = item.standHour;
+        //     item.label2 = "实际工时";
+        //     item.sum2 = item.realHour;
+        // });
+        var list=[];
+        list=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getWorkingHoursContrast");
 
         $.each(list, function(index,item){
-            item.label = item.productName;
+            item.label = item.product;
             item.label1 = "标准工时";
-            item.sum1 = item.standHour;
+            item.sum1 = item.standardWorkingHours;
             item.label2 = "实际工时";
-            item.sum2 = item.realHour;
+            item.sum2 = item.manHoursCompleted;
         });
 
         return list;

pages/dashboard/line.html

@@ -92,7 +92,7 @@
                                     <div class="task-block-title-big center">{{task.completeSum}}</div>
                                 </div>
                                 <div class="col-lg-8 col-md-8" style="padding-left: 4px;padding-top: 10px;">
-                                    <div class="task-block-text">预计开工日期：{{task.planStartDate}}</div>
+                                    <!-- <div class="task-block-text">预计开工日期：{{task.planStartDate}}</div> -->
                                     <div class="task-block-text">完工日期：{{task.planCompleteDate}}</div>
                                     <div class="task-block-text">存货：{{task.materialName}}</div>
                                     <div class="task-block-text">规格：{{task.specs}}</div>