Browse Source

页面调整

Administrator 2 years ago
parent
commit
3de8dcca3f
4 changed files with 920 additions and 85 deletions
  1. 429 0
      pages/dashboard/line-1.html
  2. 75 57
      pages/dashboard/line.html
  3. 381 0
      pages/dashboard/produce-1.html
  4. 35 28
      pages/dashboard/produce.html

+ 429 - 0
pages/dashboard/line-1.html

@@ -0,0 +1,429 @@
+<!DOCTYPE html>
+<html lang="zh">
+<style>    
+ 
+.marker {     font-size: 12px;
+ 
+     }    
+ 
+</style>
+<head>
+    
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=0.5">
+    <!-- 一个小时刷新一下当前页 -->
+    <!-- <meta http-equiv="refresh" content="3600"> -->
+    <title>产线管理看板</title>
+
+    <link href="/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="/css/dashboard.css" rel="stylesheet" />
+    <script type="text/javascript" src="/js/service/method-get-service.js"></script>
+
+
+    <script type="text/javascript" src="/js/service.js"></script>
+    <script type="text/javascript" src="/js/session.js"></script>
+    <script type="text/javascript" src="/js/getService.js"></script>
+
+
+</head>
+
+<body id="container" class="container-fluid">
+    <div class="row no-padding head-bar" style="height:81px">
+        <div class="col-lg-1 col-md-1">
+
+        </div>
+        <div class="col-lg-4 col-md-4 page-title">
+            产线管理看板
+        </div>
+        <div class="col-lg-4 col-md-4 block-padding">
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/warehouse.html');">仓库看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/produce.html');">制造看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/quality.html');">品质看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/esop.html');">E-SOP</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/video1.html');">云看板</button>
+        </div>
+        <div class="col-lg-4 col-md-4">
+        </div>
+    </div>
+    <div class="my-container" id="div-main">
+        <div class="row">
+            <div class="col-lg-3 col-md-3">
+                <!--人员信息-->
+                <div class="row block-padding">
+
+                    <div class="col-lg-12  col-md-12 center block-title">产线人员信息</div>
+                </div>
+                <div class="row" style="height: 160px;">
+                    <div class="person-div" v-for="user in userList" style="text-align: center;">
+                        <div style="margin-left:5px">
+                            <img  height="140" width="100" v-bind:src="'/upPersonnel/Mechanice/'+user.fileName" border="0" />
+                        </div>
+                        <div style="width: 90px; overflow:hidden; word-break:break-all;white-space:nowrap">
+                            {{user.fileRealName}}
+                        </div>
+                        <!-- <div class="center">
+                            {{user.realName}}&nbsp;&nbsp;{{user.inTime}}
+                        </div> -->
+                    </div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">标准工时与实际工时对比</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:240px" id="charts_11"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">产品良率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-2" style="height:240px" id="charts_12"></div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12 center block-title">生产异常分类</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
+                </div>
+            </div>
+            <div class="col-lg-7" >
+                <div class="row block-padding" style="height: 350px;">
+                    <div style="height: 200px;padding-left: 0px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
+                        <div class="task-block" :class="task.bgcss" style="height: 190px;width: 350px;">
+                            <div class="row ">
+                                <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>
+                            </div>
+                            <div class="row">
+                                <div class="col-lg-3 col-md-3" style="text-align: center;padding: 19px 0px 0px 34px;margin-right: 7px;">
+                                    <div class="task-block-title-small center">任务数量</div>
+                                    <div class="task-block-title-big center">{{task.planSum}}</div>
+                                    <div class="task-block-title-small center" style="padding-top:17px;">完工总数</div>
+                                    <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.planCompleteDate}}</div>
+                                    <div class="task-block-text">物料编码:{{task.productId}}</div>
+                                    <div class="task-block-text" style="overflow:hidden; word-break:break-all;white-space:nowrap">物料名称:{{task.materialName}}</div>
+                                    <!-- <div class="task-block-text">规格:{{task.specs}}</div> -->
+                                    <!-- <div class="task-block-text">规格:{{task.specs}}</div> -->
+                                    <div class="task-block-text">
+                                        <div style="float:left">完成进度:</div>
+                                        <div style="float:left;width:120px;padding-top:2px;">
+                                            <div class="progress">
+                                                <div class="progress-bar progress-bar-info" role="progressbar"
+                                                    aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"
+                                                    :style="{width:task.completePercent}">
+                                                    {{task.completePercent}}
+                                                </div>
+                                                <div class="progress-bar progress-bar-warning" role="progressbar"
+                                                    aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"
+                                                    :style="{width:task.incompletePercent}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row" style="padding-top: 8px;" >
+                                <div class="col-lg-3 col-md-3" style="text-align: center;padding: 4px 0px 0px 34px;margin-right: 7px;">
+                                    <div class="task-block-title-small center">工艺流程</div>
+                                </div>
+                                <div class="col-lg-8 col-md-8" style="padding-left: 4px;padding-top: 3px;">
+                                    <span style="color: aliceblue;" v-for="(t,index) in task.fbsTechnologicalProcessItemList" >
+                                        <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                        <span v-if="index==0&&t.isTechnological=='2'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:orange;"></span> -->
+                                        <span v-if="t.isTechnological=='1'" style="border-radius:5px;background-color:#1ABDE6;padding: 2px;" >{{t.name}}</span>
+                                        <span v-if="t.isTechnological=='2'" style="border-radius:5px;background-color:orange;padding: 2px;">{{t.name}}</span>
+                                        <!-- <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='1'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                        <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='2'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:orange;"></span>     -->
+                                    </span> 
+                                </div>
+                                <!-- <div class="col-lg-12 col-md-12 "  style="padding-left: 40px;overflow:hidden; word-break:break-all;white-space:nowrap">
+                                    <span class="task-block-text" ><span class="task-block-title-small center" style="margin-right: 10%;">工艺流程</span>
+                                        <span style="color: aliceblue;" v-for="(t,index) in task.fbsTechnologicalProcessItemList" >
+                                            
+                                            <span v-if="t.isTechnological=='1'" style="border-radius:5px;background-color:#1ABDE6;padding: 2px;" >{{t.name}}</span>
+                                            <span v-if="t.isTechnological=='2'" style="border-radius:5px;background-color:orange;padding: 2px;">{{t.name}}</span>
+                                            
+                                        </span> 
+                                        
+                                    </span>
+                                </div> -->
+                            </div>
+
+                        </div>
+                    </div>
+
+                </div>
+                <!--月生产计划-->
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">生产派工单</div>
+                </div>
+                <div class="row block-padding">
+                    <!-- <div class="col-lg-1 col-md-1 center no-padding">项目名称</div> -->
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">工单号</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 9%;">物料编码</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 14%;">物料名称</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">计划数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">派工数量</div>
+                    <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">标准工时</div> -->
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">完成数量</div>
+                    <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">完成工时</div> -->
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">作业人员</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 6%;">达成率</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 6%;">生产效率</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 21%;">工艺流程</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;text-align: left;">状态</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
+                </div>
+                <div class="row" v-for="product in dayProduceTaskList" style="margin-top: 5px;">
+                    <!-- <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div> -->
+                    <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
+                    <div style="width: 9%;overflow:hidden; word-break:break-all;white-space:nowrap" 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.specs}}</div> -->
+                    <div style="width: 14%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 left no-padding">{{product.materialName}}</div>
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.numberOfTasks}}</div>
+                    <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div> -->
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.latestCompletedQuantity}}</div>
+                    <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.manHoursCompleted}}</div> -->
+                    <div style="width: 8%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
+                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
+                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
+                    <div style="width: 21%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >
+                        <!-- <span style="font-size: 10px;"> -->
+                            <span style="color: aliceblue;" v-for="(t,index) in product.fbsTechnologicalProcessItemList">
+                                <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                <span v-if="index==0&&t.isTechnological=='2'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:orange;"></span> -->
+                                <span v-if="t.isTechnological=='1'" style="border-radius:5px;background-color:#1ABDE6;padding: 2px;" >{{t.name}}</span>
+                                <span v-if="t.isTechnological=='2'" style="border-radius:5px;background-color:orange;padding: 2px;">{{t.name}}</span>
+                                <!-- <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='1'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
+                                <span v-if="index==(task.fbsTechnologicalProcessItemList.length-1)&&t.isTechnological=='2'" style="font-size:15px;border-top-right-radius: 3px;border-bottom-right-radius: 3px;padding: 2px;background-color:orange;"></span>     -->
+                            </span> 
+                        <!-- </span> -->
+                    </div>
+                    <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
+                        <strong style="font-size:10px;" :style="{color:product.color}"></strong>{{product.stateName}}
+                    </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 class="col-lg-2">
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">生产效率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:190px" id="charts_21"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">工时分布</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:210px" id="charts_22"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">计划达成率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:210px" id="charts_23"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">人员出勤情况</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:210px" id="charts_24"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- jQuery  -->
+    
+    <script src="/lib/jquery.min.js"></script>
+    <script src="/lib/vue.min.js"></script>
+    <script src="/lib/echarts/echarts.min.js"></script>
+    <script src="/lib/echarts/theme/macarons.js"></script>
+    <script src="/js/service/person.js?_v=2"></script>
+    <script src="/js/service/material.js?_v=2"></script>
+    <script src="/js/service/product.js?_v=2"></script>
+    <script src="/js/service/workhour.js?_v=2"></script>
+    <script src="/js/service/produce-task.js?_v=2"></script>
+    <script src="/js/content/mycharts.js?_v=2"></script>
+    <script type="text/javascript">
+
+        //当日标准工时与实际工时对比
+        const monthGoodList = ServiceProduct.getDayGood();
+        setTimeout(beA,500);
+        var initSize = 3;    
+        var pageSizeMonthGood = 3;
+        var pageIndexMonthGood = 0;
+        function beA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + initSize;
+            ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+            if(monthGoodList.length <= pageIndexMonthGood){
+                return;
+            }
+            setInterval(beginScrollA,10000);
+        }
+        function beginScrollA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + initSize;
+            if(monthGoodList.length <= pageIndexMonthGood){
+                pageIndexMonthGood = 0;
+                pageSizeMonthGood = initSize;
+            }
+            ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+        }
+
+        //当日良率
+        const dayStandAndRealList = ServiceWorkhour.getDayStandAndRealByMaterial();
+        setTimeout(beB,600);
+        var pageSizeB = 3;
+        var pageIndexB = 0;
+        function beB(){
+            var lsitDay = dayStandAndRealList.slice(pageIndexB,pageSizeB);
+            pageIndexB = pageSizeB;
+            pageSizeB = pageSizeB + initSize;
+            ChartsService.initBarAndLine("charts_11", lsitDay,
+                        ChartsService.getGridSpanSmall());
+            if(dayStandAndRealList.length <= pageIndexB){
+                return;
+            }
+            setInterval(beginScrollA,10000);
+        }
+        function beginScrollA(){
+            var lsitDay = dayStandAndRealList.slice(pageIndexB,pageSizeB);
+            pageIndexB = pageSizeB;
+            pageSizeB = pageSizeB + initSize;
+            if(dayStandAndRealList.length <= pageIndexB){
+                pageIndexB = 0;
+                pageSizeB = initSize;
+            }
+            ChartsService.initBarAndLine("charts_11", lsitDay, ChartsService.getGridSpanSmall());
+        }
+
+
+        var vm = new Vue({
+            el: '#div-main',
+            data: {
+                userList: [],
+                dayProduceTaskList: [],
+                doingTaskList: [],
+
+                cacheDataObject: {}, // 从服务器加载的全数据,界面只取某几条
+
+                timer_long: '', // 定时取服务器数据
+                timer_short: '' // 数据超长定时轮播
+            },
+            methods: {
+                // 从服务器加载数据并显示
+                refreshData: function () {
+                    // 关闭定时器
+                    clearInterval(this.timer_short);
+                    // 刷新报表
+                    // ChartsService.initBarAndLine("charts_11", ServiceWorkhour
+                    //     .getDayStandAndRealByMaterial(), ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithTwoNumberRate("charts_12", ServiceProduct.getDayGood(), ChartsService.getGridSpanSmall());
+                    ChartsService.initBarWithShade("charts_13", ServiceProduct.getDayExceptionByCategory(), ChartsService.getGridSpanSmall());
+
+                    ChartsService.initCommonPanel("charts_21", ServiceProduct.getDayProduceRate());
+                    ChartsService.initCommonPie("charts_22", ServiceWorkhour.getDayByMaterial());
+                    ChartsService.initCommonPie("charts_23", ServiceProduceTask.getDayCompleteInfo(), [ '#ff9f7f', '#37a2da']);
+                    ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance(), [ '#37a2da','#ff9f7f']);
+                    this.loadData();
+                    // 开启定时器
+                    this.timer_short = setInterval(this.scrollData, 30000);
+                },
+                // 轮播数据
+                scrollData: function () {
+                    for (var key in this.cacheDataObject) {
+                        const dataList = this.cacheDataObject[key].data;
+                        const pagesize = this.cacheDataObject[key].pagesize;
+                        var pageindex = this.cacheDataObject[key].pageindex + 1;
+
+
+                        if (dataList.length > pagesize) {
+                            const pagesum = (dataList.length / pagesize).toFixed(0) * 1 + (dataList.length %
+                                pagesize > 0 ? 1 : 0);
+                            if (pageindex >= pagesum)
+                                pageindex = 0;
+                            this.cacheDataObject[key].pageindex = pageindex;
+                            const startIndex = pageindex * pagesize;
+                            const remainSum = dataList.length - startIndex;
+                            const recordSum = remainSum >= pagesize ? pagesize : remainSum;
+                            const keyPar = dataList.slice(startIndex, startIndex + pagesize);
+                            if(keyPar.length < 1){
+                                continue;
+                            }
+                            this[key] = dataList.slice(startIndex, startIndex + pagesize);
+                        }
+                    }
+
+                },
+                // 从服务器加载数据
+                loadData: function () {
+                    this.cacheDataObject = {};
+
+                    const userList = ServicePerson.getWorkPersonList();
+                    this.cacheDataObject.userList = {
+                        data: userList,
+                        pagesize: 4,
+                        pageindex: 0
+                    }
+                    this.userList = userList.slice(0, this.cacheDataObject.userList.pagesize);
+                    // 生产计划
+                    const dayProduceTaskList = ServiceProduceTask.getDayList();
+                    this.cacheDataObject.dayProduceTaskList = {
+                        data: dayProduceTaskList,
+                        pagesize: 18,
+                        pageindex: 0
+                    }
+                    this.dayProduceTaskList = dayProduceTaskList.slice(0, this.cacheDataObject
+                        .dayProduceTaskList.pagesize);
+                    // 在生产图片
+                    const doingTaskList = ServiceProduceTask.getDoingListByOrder();
+                    this.cacheDataObject.doingTaskList = {
+                        data: doingTaskList,
+                        pagesize: 6,
+                        pageindex: 0
+                    }
+                    this.doingTaskList = doingTaskList.slice(0, this.cacheDataObject.doingTaskList
+                        .pagesize);
+
+                }
+            },
+            mounted() {
+                this.timer_long = setInterval(this.refreshData, 120000);
+                this.refreshData();
+
+            },
+            beforeDestroy() {
+                clearInterval(this.timer_long);
+                clearInterval(this.timer_short);
+            }
+        });
+    </script>
+
+</body>
+
+</html>

+ 75 - 57
pages/dashboard/line.html

@@ -77,7 +77,7 @@
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:240px" id="charts_11"></div>
                 </div>
-                <div class="row block-padding">
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">产品良率</div>
                 </div>
                 <div class="row">
@@ -88,9 +88,21 @@
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
+                </div> -->
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">生产效率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:190px" id="charts_21"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">计划达成率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:210px" id="charts_23"></div>
                 </div>
             </div>
-            <div class="col-lg-7" >
+            <div class="col-lg-9" >
                 <div class="row block-padding" style="height: 350px;">
                     <div style="height: 200px;padding-left: 0px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
                         <div class="task-block" :class="task.bgcss" style="height: 190px;width: 350px;">
@@ -166,37 +178,45 @@
                 </div>
                 <div class="row block-padding">
                     <!-- <div class="col-lg-1 col-md-1 center no-padding">项目名称</div> -->
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">工单号</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">工作中心</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">工单编号</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 9%;">物料编码</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 14%;">物料名称</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">计划数量</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">派工数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 3%;">派工数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 3%;">剩余数量</div>
                     <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">标准工时</div> -->
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">完成数量</div>
+                    <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">完成数量</div> -->
                     <!-- <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;">完成工时</div> -->
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">作业人员</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 6%;">达成率</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 6%;">生产效率</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 21%;">工艺流程</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">达成率</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">标准工时</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">生产效率</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;text-align: left;">状态</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 20%;">工艺流程</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">作业人员</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList" style="margin-top: 5px;">
                     <!-- <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div> -->
-                    <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.workCenter}}</div>
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                     <div style="width: 9%;overflow:hidden; word-break:break-all;white-space:nowrap" 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.specs}}</div> -->
                     <div style="width: 14%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 left no-padding">{{product.materialName}}</div>
-                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
-                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.numberOfTasks}}</div>
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.plannedQuantity}}</div>
+                    <div style="width: 3%;" class="col-lg-1 col-md-1 center no-padding">{{product.numberOfTasks}}</div>
                     <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div> -->
-                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.latestCompletedQuantity}}</div>
+                    <div style="width: 3%;" class="col-lg-1 col-md-1 center no-padding">{{product.remainingQuantity}}</div>
+                    <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.latestCompletedQuantity}}</div> -->
                     <!-- <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">{{product.manHoursCompleted}}</div> -->
-                    <div style="width: 8%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
-                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
-                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
-                    <div style="width: 21%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >
+                    <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
+                    <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.standardWorkingHours}}</div>
+                    <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
+                    <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
+                        <strong style="font-size:10px;" :style="{color:product.color}"></strong>{{product.stateName}}
+                    </div>
+                    <div style="width: 20%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >
                         <!-- <span style="font-size: 10px;"> -->
                             <span style="color: aliceblue;" v-for="(t,index) in product.fbsTechnologicalProcessItemList">
                                 <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
@@ -208,9 +228,7 @@
                             </span> 
                         <!-- </span> -->
                     </div>
-                    <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
-                        <strong style="font-size:10px;" :style="{color:product.color}"></strong>{{product.stateName}}
-                    </div>
+                    <div style="width: 8%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</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}">
@@ -223,32 +241,32 @@
                     </div> -->
                 </div>
             </div>
-            <div class="col-lg-2">
-                <div class="row block-padding">
+            <!-- <div class="col-lg-2"> -->
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">生产效率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:190px" id="charts_21"></div>
-                </div>
-                <div class="row block-padding">
+                </div> -->
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">工时分布</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_22"></div>
-                </div>
-                <div class="row block-padding">
+                </div> -->
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">计划达成率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_23"></div>
-                </div>
-                <div class="row block-padding">
+                </div> -->
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">人员出勤情况</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_24"></div>
-                </div>
-            </div>
+                </div> -->
+            <!-- </div> -->
         </div>
     </div>
 
@@ -268,32 +286,32 @@
 
         //当日标准工时与实际工时对比
         const monthGoodList = ServiceProduct.getDayGood();
-        setTimeout(beA,500);
+        // setTimeout(beA,500);
         var initSize = 3;    
         var pageSizeMonthGood = 3;
         var pageIndexMonthGood = 0;
-        function beA(){
-            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
-            ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
-                        ChartsService.getGridSpanSmall());
-            if(monthGoodList.length <= pageIndexMonthGood){
-                return;
-            }
-            setInterval(beginScrollA,10000);
-        }
-        function beginScrollA(){
-            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
-            if(monthGoodList.length <= pageIndexMonthGood){
-                pageIndexMonthGood = 0;
-                pageSizeMonthGood = initSize;
-            }
-            ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
-                        ChartsService.getGridSpanSmall());
-        }
+        // function beA(){
+        //     var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+        //     pageIndexMonthGood = pageSizeMonthGood;
+        //     pageSizeMonthGood = pageSizeMonthGood + initSize;
+        //     ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
+        //                 ChartsService.getGridSpanSmall());
+        //     if(monthGoodList.length <= pageIndexMonthGood){
+        //         return;
+        //     }
+        //     setInterval(beginScrollA,10000);
+        // }
+        // function beginScrollA(){
+        //     var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+        //     pageIndexMonthGood = pageSizeMonthGood;
+        //     pageSizeMonthGood = pageSizeMonthGood + initSize;
+        //     if(monthGoodList.length <= pageIndexMonthGood){
+        //         pageIndexMonthGood = 0;
+        //         pageSizeMonthGood = initSize;
+        //     }
+        //     ChartsService.initBarWithTwoNumberRate("charts_12", lsitMonth,
+        //                 ChartsService.getGridSpanSmall());
+        // }
 
         //当日良率
         const dayStandAndRealList = ServiceWorkhour.getDayStandAndRealByMaterial();
@@ -344,12 +362,12 @@
                     // ChartsService.initBarAndLine("charts_11", ServiceWorkhour
                     //     .getDayStandAndRealByMaterial(), ChartsService.getGridSpanSmall());
                     // ChartsService.initBarWithTwoNumberRate("charts_12", ServiceProduct.getDayGood(), ChartsService.getGridSpanSmall());
-                    ChartsService.initBarWithShade("charts_13", ServiceProduct.getDayExceptionByCategory(), ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_13", ServiceProduct.getDayExceptionByCategory(), ChartsService.getGridSpanSmall());
 
                     ChartsService.initCommonPanel("charts_21", ServiceProduct.getDayProduceRate());
-                    ChartsService.initCommonPie("charts_22", ServiceWorkhour.getDayByMaterial());
+                    // ChartsService.initCommonPie("charts_22", ServiceWorkhour.getDayByMaterial());
                     ChartsService.initCommonPie("charts_23", ServiceProduceTask.getDayCompleteInfo(), [ '#ff9f7f', '#37a2da']);
-                    ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance(), [ '#37a2da','#ff9f7f']);
+                    // ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance(), [ '#37a2da','#ff9f7f']);
                     this.loadData();
                     // 开启定时器
                     this.timer_short = setInterval(this.scrollData, 30000);

+ 381 - 0
pages/dashboard/produce-1.html

@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=0.5">
+    <title>制造管理看板</title>
+
+    <link href="/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="/css/dashboard.css" rel="stylesheet" />
+
+    <script type="text/javascript" src="/js/service.js"></script>
+    <script type="text/javascript" src="/js/session.js"></script>
+    <script type="text/javascript" src="/js/service/method-get-service.js"></script>
+
+    <script type="text/javascript" src="/lib/jquery-3.4.1.js"></script>
+    <script type="text/javascript" src="/lib/jquery-3.4.1.min.js"></script>
+
+</head>
+
+<body id="container" class="container-fluid">
+    <div class="row no-padding head-bar" style="height:81px">
+        <div class="col-lg-1 col-md-1">
+
+        </div>
+        <div class="col-lg-4 col-md-4 page-title">
+            制造管理看板
+        </div>
+        <div class="col-lg-4 col-md-4 block-padding">
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/warehouse.html');">仓库看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/line.html');">产线看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/quality.html');">品质看板</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/esop.html');">E-SOP</button>
+            <button type="button" class="btn btn-warning"
+                onclick="window.location.replace('/pages/dashboard/video1.html');">云看板</button>
+        </div>
+        <div class="col-lg-4 col-md-4">
+        </div>
+    </div>
+    <div class="my-container" id="div-main">
+        <div class="row">
+            <div class="col-lg-3 col-md-3">
+                <!--生产计划达成率-->
+                <div class="row block-padding">
+                    <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:295px" id="charts_11"></div>
+                </div>
+                <!--月工时分布情况-->
+                <div class="row block-padding">
+                    <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:295px" id="charts_12"></div>
+                </div>
+                <!--月质量异常分类 -->
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">生产异常分类</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_13"></div>
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6">
+                <!--月生产计划-->
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">生产计划</div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-1 col-md-1 center no-padding" >工单号</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">项目名</div>
+                    <div class="col-lg-1 col-md-1 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-1 col-md-1 center no-padding">计划数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">标准工时</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">实际工时</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div>
+                    <!-- <span style="background-color:#5bc0de">&nbsp;&nbsp;&nbsp;</span> -->
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height: 350px;">
+                        <div class="row" v-for="product in mouthProduceTaskList">
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-3 col-md-3 center no-padding">{{product.define12}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" 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.specs}}</div> -->
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{product.materialName}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.manHoursInvested}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding progress">
+                                <span style="z-index:999;position:absolute;">{{product.completePercent}}</span>
+                                <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
+                                    aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">
+                                    <!-- {{product.completePercent}} -->
+                                </div>
+                                <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
+                                    aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
+                                    <!-- {{product.incompletePercent}} -->
+                                </div>
+                                
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-6 col-md-6">
+                        <div class="row">
+                            <div class="col-lg-12 col-md-12 center block-title">人员出勤率</div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_21"></div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-12 center block-title">产品良率</div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-2" style="height:260px" id="charts_22"></div>
+                        </div>
+                    </div>
+                    <div class="col-lg-6 col-md-6">
+                        <div class="row">
+                            <div class="col-lg-12 col-md-12 center block-title">制程质量不良</div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_23"></div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-12 center block-title">周成品入库数量</div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-2" style="height:260px" id="charts_24"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-3" >
+                <div class="row block-padding"  >
+                    <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:290px" id="charts_31"></div>
+                </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">项目完工进度</div>
+                </div>
+                    <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
+                    <!--月生产计划-->
+                <div class="row block-padding">
+                    <!-- <div class="col-lg-3 col-md-3 center no-padding">工单号</div> -->
+                    <div class="col-lg-3 col-md-3 center no-padding" style="text-align: center;">项目名</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-3 col-md-3 center no-padding">完工百分比</div>
+                </div>
+                <div class="row" >
+                    <div class="col-lg-12 col-md-12" style="height:295px">
+                        <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" style="overflow:hidden; word-break:break-all;white-space:nowrap;text-align: center;">{{product.define12}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.planSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.workHour}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.manHoursInvested}}</div>
+                            <div class="col-lg-3 col-md-3 center no-padding progress">
+                                <span style="z-index:999;position:absolute;">{{product.completePercent}}</span>
+                                <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
+                                    aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">
+                                    <!-- {{product.completePercent}} -->
+                                </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 class="row ">
+                    <div class="col-lg-12 col-md-12 center block-title">项目发货统计</div>
+                </div>
+                <div class="row " >
+                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_33"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- jQuery  -->
+    <script src="/lib/jquery.min.js"></script>
+    <script src="/lib/vue.min.js"></script>
+    <script src="/lib/echarts/echarts.min.js"></script>
+    <script src="/lib/echarts/theme/macarons.js"></script>
+    <script src="/js/service/material.js?_v=2"></script>
+    <script src="/js/service/product.js?_v=2"></script>
+    <script src="/js/service/person.js?_v=2"></script>
+    <script src="/js/service/produce-task.js?_v=2"></script>
+    <script src="/js/service/workhour.js?_v=2"></script>
+    <script src="/js/content/mycharts.js?_v=2"></script>
+    <script type="text/javascript">
+
+        // 参数说明:beginFun("图表ID","list形式数据","翻页时间(毫秒)","本页面唯一id(不可重复)")
+        // ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
+        //                 ChartsService.getGridSpanSmall());
+        var initSize = 3;
+        var pageSize = 3;
+        var pageIndex = 0;
+        var pageSizeA = 3;
+        var pageIndexA = 0;
+        const weekInBycategoryList = ServiceProduct.getWeekInByCategory();
+        setTimeout(beginFun("charts_24",weekInBycategoryList,10000,"charts_24"),500);
+
+
+        
+        var pageSizeMonthGoodB = 3;
+        var pageIndexMonthGoodB = 0;
+        const monthExceptionByCategory =  ServiceProduct.getMonthExceptionByCategory();
+        // setTimeout(beginFunA("charts_23",monthExceptionByCategory,10000,"charts_23"),500);
+        setTimeout(beB,500);
+        function beB(){
+            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGoodB,pageSizeMonthGoodB);
+            pageIndexMonthGoodB = pageSizeMonthGoodB;
+            pageSizeMonthGoodB = pageSizeMonthGoodB + initSize;
+            ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+            if(monthExceptionByCategory.length <= pageIndexMonthGoodB){
+                return;
+            }
+            setInterval(beginScrollB,10000);
+        }
+        function beginScrollB(){
+            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGoodB,pageSizeMonthGoodB);
+            pageIndexMonthGoodB = pageSizeMonthGoodB;
+            pageSizeMonthGoodB = pageSizeMonthGoodB + initSize;
+            if(monthExceptionByCategory.length <= pageIndexMonthGoodB){
+                pageIndexMonthGoodB = 0;
+                pageSizeMonthGoodB = initSize;
+            }
+            ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+        }
+        
+        const monthGoodList =  ServiceProduct.getMonthGood();
+        setTimeout(beA,500);
+        var pageSizeMonthGood = 3;
+        var pageIndexMonthGood = 0;
+        function beA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + initSize;
+            ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+            if(monthGoodList.length <= pageIndexMonthGood){
+                return;
+            }
+            setInterval(beginScrollA,10000);
+        }
+        function beginScrollA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + initSize;
+            if(monthGoodList.length <= pageIndexMonthGood){
+                pageIndexMonthGood = 0;
+                pageSizeMonthGood = initSize;
+            }
+            ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+        }
+        
+
+        var vm = new Vue({
+            el: '#div-main',
+            data: {
+                mouthProduceTaskList: [],
+                projectScheduleCompletionList:[],
+
+                cacheDataObject: {}, // 从服务器加载的全数据,界面只取某几条
+
+                timer_long: '', // 定时取服务器数据
+                timer_short: '' // 数据超长定时轮播
+            },
+            methods: {
+                // 从服务器加载数据并显示
+                refreshData: function () {
+                    // 关闭定时器
+                    clearInterval(this.timer_short);
+                    // 刷新报表
+                    ChartsService.initCommonPie("charts_11", ServiceProduceTask.getCompleteInfo(), [ '#ff9f7f', '#37a2da']);
+                    ChartsService.initCommonPie("charts_12", ServiceWorkhour.getByMaterial());
+                    ChartsService.initBarWithShade("charts_13", ServiceProduct
+                        .getQualityExceptionByCategory(), ChartsService.getGridSpanSmall());
+
+                    ChartsService.initBarWithTwoNumberRate("charts_21", ServicePerson.getMonthAttendance(),
+                        ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithTwoNumberRate("charts_22", ServiceProduct.getMonthGood(),
+                    //     ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_23", ServiceProduct
+                    //     .getMonthExceptionByCategory(), ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
+                    //     ChartsService.getGridSpanSmall());
+
+                    ChartsService.initCommonPanel("charts_31", ServiceProduct.getProduceRate());
+                    // ChartsService.initBarAndLine("charts_32", ServiceWorkhour.getStandAndRealByMaterial());
+                    ChartsService.initBarWithShade("charts_33", ServiceProduct.getMonthSendByProject());
+                    this.loadData();
+                    // 开启定时器
+                    this.timer_short = setInterval(this.scrollData, 5000);
+                },
+                // 轮播数据
+                scrollData: function () {
+                    for (var key in this.cacheDataObject) {
+                        const dataList = this.cacheDataObject[key].data;
+                        const pagesize = this.cacheDataObject[key].pagesize;
+                        var pageindex = this.cacheDataObject[key].pageindex + 1;
+
+
+                        if (dataList.length > pagesize) {
+                            const pagesum = (dataList.length / pagesize).toFixed(0) * 1 + (dataList.length %
+                                pagesize > 0 ? 1 : 0);
+                            if (pageindex >= pagesum)
+                                pageindex = 0;
+                            this.cacheDataObject[key].pageindex = pageindex;
+                            const startIndex = pageindex * pagesize;
+                            const remainSum = dataList.length - startIndex;
+                            const recordSum = remainSum >= pagesize ? pagesize : remainSum;
+                            const keyPar = dataList.slice(startIndex, startIndex + pagesize);
+                            if(keyPar.length < 1){
+                                continue;
+                            }
+                            this[key] = dataList.slice(startIndex, startIndex + pagesize);
+                        }
+                    }
+
+                },
+                // 从服务器加载数据
+                loadData: function () {
+                    this.cacheDataObject = {};
+
+                    // 月度生产计划
+                    const mouthProduceTaskList = ServiceProduceTask.getMonthList();
+                    this.cacheDataObject.mouthProduceTaskList = {
+                        data: mouthProduceTaskList,
+                        pagesize: 9,
+                        pageindex: 0
+                    }
+                    this.mouthProduceTaskList = mouthProduceTaskList.slice(0, this.cacheDataObject
+                        .mouthProduceTaskList.pagesize);
+
+                    //项目进度完工百分比
+                    const projectScheduleCompletionList = ServiceProduceTask.getProjectScheduleCompletion();
+                    this.cacheDataObject.projectScheduleCompletionList = {
+                        data: projectScheduleCompletionList,
+                        pagesize: 7,
+                        pageindex: 0
+                    }
+                    this.projectScheduleCompletionList = projectScheduleCompletionList.slice(0, this.cacheDataObject
+                        .projectScheduleCompletionList.pagesize);
+
+                }
+            },
+            mounted() {
+                this.timer_long = setInterval(this.refreshData, 100000);
+                this.refreshData();
+
+            },
+            beforeDestroy() {
+                clearInterval(this.timer_long);
+                clearInterval(this.timer_short);
+            }
+        });
+    </script>
+
+</body>
+
+</html>

+ 35 - 28
pages/dashboard/produce.html

@@ -117,11 +117,17 @@
                         <div class="row">
                             <div class="col-lg-12 col-md-2" style="height:250px" id="charts_21"></div>
                         </div>
-                        <div class="row">
+                        <!-- <div class="row">
                             <div class="col-lg-12 col-md-12 center block-title">产品良率</div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-2" style="height:260px" id="charts_22"></div>
+                        </div> -->
+                        <div class="row ">
+                            <div class="col-lg-12 col-md-12 center block-title">项目发货统计</div>
+                        </div>
+                        <div class="row " >
+                            <div class="col-lg-12 col-md-2" style="height:260px" id="charts_33"></div>
                         </div>
                     </div>
                     <div class="col-lg-6 col-md-6">
@@ -161,7 +167,8 @@
                     <div class="col-lg-3 col-md-3 center no-padding">完工百分比</div>
                 </div>
                 <div class="row" >
-                    <div class="col-lg-12 col-md-12" style="height:295px">
+                    <!-- <div class="col-lg-12 col-md-12" style="height:295px"> -->
+                        <div class="col-lg-12 col-md-12" style="height:555px">
                         <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" style="overflow:hidden; word-break:break-all;white-space:nowrap;text-align: center;">{{product.define12}}</div>
@@ -182,12 +189,12 @@
                         </div>
                     </div>
                 </div>
-                <div class="row ">
+                <!-- <div class="row ">
                     <div class="col-lg-12 col-md-12 center block-title">项目发货统计</div>
                 </div>
                 <div class="row " >
                     <div class="col-lg-12 col-md-12" style="height:260px" id="charts_33"></div>
-                </div>
+                </div> -->
             </div>
         </div>
     </div>
@@ -247,31 +254,31 @@
         }
         
         const monthGoodList =  ServiceProduct.getMonthGood();
-        setTimeout(beA,500);
+        // setTimeout(beA,500);
         var pageSizeMonthGood = 3;
         var pageIndexMonthGood = 0;
-        function beA(){
-            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
-            ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
-                        ChartsService.getGridSpanSmall());
-            if(monthGoodList.length <= pageIndexMonthGood){
-                return;
-            }
-            setInterval(beginScrollA,10000);
-        }
-        function beginScrollA(){
-            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
-            if(monthGoodList.length <= pageIndexMonthGood){
-                pageIndexMonthGood = 0;
-                pageSizeMonthGood = initSize;
-            }
-            ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
-                        ChartsService.getGridSpanSmall());
-        }
+        // function beA(){
+        //     var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+        //     pageIndexMonthGood = pageSizeMonthGood;
+        //     pageSizeMonthGood = pageSizeMonthGood + initSize;
+        //     ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
+        //                 ChartsService.getGridSpanSmall());
+        //     if(monthGoodList.length <= pageIndexMonthGood){
+        //         return;
+        //     }
+        //     setInterval(beginScrollA,10000);
+        // }
+        // function beginScrollA(){
+        //     var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+        //     pageIndexMonthGood = pageSizeMonthGood;
+        //     pageSizeMonthGood = pageSizeMonthGood + initSize;
+        //     if(monthGoodList.length <= pageIndexMonthGood){
+        //         pageIndexMonthGood = 0;
+        //         pageSizeMonthGood = initSize;
+        //     }
+        //     ChartsService.initBarWithTwoNumberRate("charts_22", lsitMonth,
+        //                 ChartsService.getGridSpanSmall());
+        // }
         
 
         var vm = new Vue({
@@ -356,7 +363,7 @@
                     const projectScheduleCompletionList = ServiceProduceTask.getProjectScheduleCompletion();
                     this.cacheDataObject.projectScheduleCompletionList = {
                         data: projectScheduleCompletionList,
-                        pagesize: 7,
+                        pagesize: 14,
                         pageindex: 0
                     }
                     this.projectScheduleCompletionList = projectScheduleCompletionList.slice(0, this.cacheDataObject