charts_21

js/content/mycharts.js

@@ -237,7 +237,7 @@ var ChartsService = {
         });
 
         var option = {
-            color: ['#37a2da', '#ffd85c'],
+            color: ['#37a2da', '#FF4040'],
             grid:{
                 left:"20%",
                 right:"10%",

js/service/produce-task.js

@@ -345,6 +345,10 @@ var ServiceProduceTask = {
         });
         return taskList;
     },
+    //项目进度完工百分比
+    getProjectScheduleCompletion:function(){
+        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProjectScheduleCompletion");
+    },
     // 获取到现在为止在进行订单或者项目
     getDoingListByOrder: function () {
         // const taskList = [];

js/service/product.js

@@ -85,7 +85,7 @@ var ServiceProduct = {
         //     "项目D": 150,
         //     "项目E": 200,
         // };
-        return MethodGetService.methodGet("/fbsDispatchLists/fbsDispatchLists/getProjectDelivery");
+        return MethodGetService.methodGet("/fbsDispatchLists/fbsDispatchLists/getMonthSendByProject");
 
     },
     // 成品库存，物料维度
@@ -189,7 +189,7 @@ var ServiceProduct = {
         // const rate = 95;
         rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
         return {
-            name: "生产效率",
+            name: "当月生产效率",
             value: rate
         };
 
@@ -197,7 +197,7 @@ var ServiceProduct = {
     // 日生产效率
     getDayProduceRate: function () {
         // const rate = 90;
-        rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
+        rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency?type=1");
         return {
             name: "生产效率",
             value: rate

js/service/workhour.js

@@ -50,6 +50,7 @@ var ServiceWorkhour={
         return list;
 
     },
+
     // 获取当日物料的标准工时和实际工时
     getDayStandAndRealByMaterial:function(){
         // const list = [];

pages/dashboard/produce.html

@@ -133,16 +133,46 @@
             </div>
             <div class="col-lg-3">
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">生产效率</div>
+                    <div class="col-lg-12 col-md-12 center block-title">当月生产效率</div>
                 </div>
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12" style="height:260px" id="charts_31"></div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">标准工时与实际工时对比</div>
+                    <div class="col-lg-12 col-md-12 center block-title">项目进度完工百分比</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div>
+                    <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
+                    <!--月生产计划-->
+                <div class="col-lg-12 col-md-12">
+                    <div class="col-lg-3 col-md-3 center no-padding">工单号</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">项目名</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">产品数量</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">工时</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">已投入工时</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
+                </div>
+                <div class="col-lg-12 col-md-12">
+                    <div class="col-lg-12 col-md-12" >
+                        <div class="row" v-for="product in projectScheduleCompletionList">
+                            <div class="col-lg-3 col-md-3 center no-padding">{{product.productionOrderNumberName}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding">{{product.projectName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.numberOfTasks}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.standardWorkingHours}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.manHoursCompleted}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding progress">
+                                <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
+                                    aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">
+                                    {{product.completeSum}}
+                                </div>
+                                <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
+                                    aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
+                                    {{product.incompleteSum}}
+                                </div>
+                            </div> -->
+                        </div>
+                    </div>
+                </div>
                 </div>
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">月度项目发货统计</div>
@@ -170,7 +200,7 @@
             el: '#div-main',
             data: {
                 mouthProduceTaskList: [],
-
+                projectScheduleCompletionList:[],
 
                 cacheDataObject: {}, // 从服务器加载的全数据，界面只取某几条
 
@@ -198,7 +228,7 @@
                         ChartsService.getGridSpanSmall());
 
                     ChartsService.initCommonPanel("charts_31", ServiceProduct.getProduceRate());
-                    ChartsService.initBarAndLine("charts_32", ServiceWorkhour.getStandAndRealByMaterial());
+                    // ChartsService.initBarAndLine("charts_32", ServiceWorkhour.getStandAndRealByMaterial());
                     ChartsService.initBarWithShade("charts_33", ServiceProduct.getMonthSendByProject());
                     this.loadData();
                     // 开启定时器
@@ -234,12 +264,24 @@
                     const mouthProduceTaskList = ServiceProduceTask.getMonthList();
                     this.cacheDataObject.mouthProduceTaskList = {
                         data: mouthProduceTaskList,
-                        pagesize: 10,
+                        pagesize: 7,
                         pageindex: 0
                     }
                     this.mouthProduceTaskList = mouthProduceTaskList.slice(0, this.cacheDataObject
                         .mouthProduceTaskList.pagesize);
 
+                    //项目进度完工百分比
+                    this.cacheDataObject2 = {};
+                    
+                    const projectScheduleCompletionList = ServiceProduceTask.getProjectScheduleCompletion();
+                    this.cacheDataObject2.projectScheduleCompletionList = {
+                        data: projectScheduleCompletionList,
+                        pagesize: 5,
+                        pageindex: 0
+                    }
+                    this.projectScheduleCompletionList = projectScheduleCompletionList.slice(0, this.cacheDataObject2
+                        .projectScheduleCompletionList.pagesize);
+
                 }
             },
             mounted() {

pages/dashboard/quality.html

@@ -56,8 +56,8 @@
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">计划到货日期</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div>
+                    <div class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">到货<br />数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
                 </div>
@@ -66,10 +66,10 @@
                         <div class="row" v-for="product in willArriveMeterialList">
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.vendorName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.cvenCode}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.memo}}</div>
                         </div>
@@ -127,7 +127,7 @@
                         <div class="row" v-for="product in waitingInList">
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.vendorName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.cVenCode}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>