Home Explore Help
Sign In
yuansh
/
FBS_VIEW
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

产线

chenc 4 years ago
parent
d4d4ed5571
commit
172b93e353
5 changed files with 62 additions and 46 deletions
Split View Show Diff Stats
  1. 3 1
      js/content/mycharts.js
  2. 10 6
      js/service/produce-task.js
  3. 40 30
      pages/dashboard/line.html
  4. 5 5
      pages/dashboard/produce.html
  5. 4 4
      pages/dashboard/quality.html

+ 3 - 1
js/content/mycharts.js
View File 

@@ -723,7 +723,9 @@ var ChartsService = {
 
             },
 
             xAxis: {
 
                 type: 'category',
 
-                boundaryGap: false,
 
+                axisTick: {
 
+                    alignWithLabel: true
 
+                },
 
                 data: xDataList,
 
                 axisLabel: {
 
                     show: true,

+ 10 - 6
js/service/produce-task.js
View File 

@@ -113,7 +113,7 @@ var ServiceProduceTask = {
 
             element.materialName=element.cinvname,
 
             element.specs=element.cinvstd,
 
             element.planSum=element.qty,
 
-            element.workHour= element.cinvDefine13,
 
+            element.workHour= (element.cinvDefine13*element.qty).toFixed(2),
 
             element.completeSum=element.qualifiedinqty,
 
             element.manHoursInvested=element.manHoursInvested
 
         })
 
@@ -334,16 +334,20 @@ var ServiceProduceTask = {
 
             element.workHour= element.standardWorkingHours
 
             // element.completeSum=element.qualifiedinqty
 
             if(element.state==='0'){
 
-                element.stateName="派工"
 
+                element.stateName="派工";
 
+                element.color="red";
 
             }
 
             if(element.state==='1'){
 
-                element.stateName="上岗"
 
+                element.stateName="上岗";
 
+                element.color="blueviolet";
 
             }
 
             if(element.state==='2'){
 
-                element.stateName="暂停"
 
+                element.stateName="暂停";
 
+                element.color="yellow";
 
             }
 
             if(element.state==='3'&&element.latestCompletedQuantity!==element.numberOfTasks){
 
-                element.stateName="进行中"
 
+                element.stateName="进行中";
 
+                element.color="yellow";
 
             }
 
         })
 
 
@@ -361,7 +365,7 @@ var ServiceProduceTask = {
 
                 item.achievementRate=0
 
             }
 
             //生产率处理 
-            if(!item.productionEfficiency){
 
+            if(!item.productionEfficiency||Number(item.latestCompletedQuantity)===0){
 
                 item.productionEfficiency=0.00
 
             }

+ 40 - 30
pages/dashboard/line.html
View File 

@@ -1,7 +1,14 @@
 
 <!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">
 
     <!-- 一个小时刷新一下当前页 -->
 
@@ -71,7 +78,7 @@
 
                     <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 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>
 
@@ -83,9 +90,9 @@
 
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
 
                 </div>
 
             </div>
 
-            <div class="col-lg-7" >
 
+            <div class="col-lg-7" style="padding-left: 50px;">
 
                 <div class="row block-padding" style="height: 350px;">
 
-                    <div style="height: 180px;" class="col-lg-4 col-md-4 padding-around" v-for="task in doingTaskList">
 
+                    <div style="height: 180px;padding: 0px 30px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
 
                         <div class="task-block" :class="task.bgcss">
 
                             <div class="row ">
 
                                 <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>
 
@@ -132,36 +139,38 @@
 
                     <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">工单号</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" style="width: 8%;">工单号</div>
 
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 12%;">物料编码</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-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-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-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: 8%;">达成率</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-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
 
                 </div>
 
                 <div class="row" v-for="product in dayProduceTaskList">
 
-                    <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 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-1 col-md-1 center no-padding">{{product.materialCode}}</div>
 
+                    <!-- <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: 12%;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-1 col-md-1 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.latestCompletedQuantity}}</div>
 
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.manHoursCompleted}}</div>
 
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
 
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
 
-                    <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
 
-                    <div class="col-lg-1 col-md-1 center no-padding">
 
-                        {{product.stateName}}
 
+                    <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%;" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
 
+                    <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
 
+                    <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
 
+                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">     
+                    <strong style="font-size:large;" :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"
 
@@ -205,6 +214,7 @@
 
     </div>
 
 
     <!-- jQuery  -->
 
+    
     <script src="/lib/jquery.min.js"></script>
 
     <script src="/lib/vue.min.js"></script>
 
     <script src="/lib/echarts/echarts.min.js"></script>
 
@@ -303,7 +313,7 @@
 
                     ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance(), [ '#37a2da','#ff9f7f']);
 
                     this.loadData();
 
                     // 开启定时器
 
-                    this.timer_short = setInterval(this.scrollData, 5000);
 
+                    this.timer_short = setInterval(this.scrollData, 30000);
 
                 },
 
                 // 轮播数据
 
                 scrollData: function () {

+ 5 - 5
pages/dashboard/produce.html
View File 

@@ -143,8 +143,8 @@
 
                 </div>
 
             </div>
 
             <div class="col-lg-3" style="height: 100%;">
 
-                <div class="row block-padding"  style="min-height: 70px;">
 
-                    <div class="col-lg-12 col-md-12 center block-title" style="margin-top: 10px;">当月生产效率</div>
 
+                <div class="row block-padding"  >
 
+                    <div class="col-lg-12 col-md-12 center block-title" >当月生产效率</div>
 
                 </div>
 
                 <div class="row block-padding" style="height: 33%;min-height: 290px;">
 
                     <div class="col-lg-12 col-md-12" style="height:260px" id="charts_31"></div>
 
@@ -152,7 +152,7 @@
 
                 <div class="row block-padding">
 
                     <div class="col-lg-12 col-md-12 center block-title">项目完工进度</div>
 
                 </div>
 
-                <div class="row block-padding" style="height: 33%;min-height: 250px;">
 
+                <div class="row block-padding" style="height: 33%;min-height: 290px;">
 
                     <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
 
                     <!--月生产计划-->
 
                 <div class="col-lg-12 col-md-12">
 
@@ -167,7 +167,7 @@
 
                     <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.define12}}</div>
 
+                            <div class="col-lg-3 col-md-3 center no-padding" style="overflow:hidden; word-break:break-all;white-space:nowrap">{{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>
 
@@ -334,7 +334,7 @@
 
                     const projectScheduleCompletionList = ServiceProduceTask.getProjectScheduleCompletion();
 
                     this.cacheDataObject.projectScheduleCompletionList = {
 
                         data: projectScheduleCompletionList,
 
-                        pagesize: 5,
 
+                        pagesize: 8,
 
                         pageindex: 0
 
                     }
 
                     this.projectScheduleCompletionList = projectScheduleCompletionList.slice(0, this.cacheDataObject

+ 4 - 4
pages/dashboard/quality.html
View File 

@@ -120,16 +120,16 @@
 
                 </div>
 
                 <div class="row block-padding">
 
                     <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
 
-                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">计划<br/>到货日期</div>
 
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
 
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
 
                     <div style="width: 17%;" class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
 
                     <div style="width: 20%;" 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 style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">到货<br />数量</div>
 
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">未入库<br />数量</div>
 
                     <div style="width: 13%;" class="col-lg-1 col-md-1 center no-padding padding-line">项目名</div>
 
                 </div>
 
                 <div class="row">
 
-                    <div class="col-lg-12 col-md-12" style="min-height: 180px;height: 180px;">
 
+                    <div class="col-lg-12 col-md-12" >
 
                         <div class="row" v-for="product in waitingInList">
 
                             <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
 
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
 
@@ -146,7 +146,7 @@
 
                     <div class="col-lg-12 col-md-12 center block-title-important">年度质量合格率</div>
 
                 </div>
 
                 <div class="row">
 
-                    <div class="col-lg-12 col-md-12" style="height:300px" id="charts_11"></div>
 
+                    <div class="col-lg-12 col-md-12" style="height:380px" id="charts_11"></div>
 
                 </div>
 
                 <!-- <div class="row block-padding">
 
                     <div class="col-lg-12 col-md-12 center block-title">当月供应商合格率实时展示</div>