界面跳转

js/service/produce-task.js

@@ -227,6 +227,86 @@ var ServiceProduceTask = {
             workHour: 10,
             completeSum: 60
         });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10001",
+            materialCode: "10001",
+            materialName: "物料A",
+            specs: "3*4",
+            planSum: 30,
+            workHour: 60,
+            completeSum: 15
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10002",
+            materialCode: "10002",
+            materialName: "物料B",
+            specs: "3*4",
+            planSum: 20,
+            workHour: 50,
+            completeSum: 18
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10003",
+            materialCode: "10003",
+            materialName: "物料C",
+            specs: "3*4",
+            planSum: 90,
+            workHour: 10,
+            completeSum: 60
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10001",
+            materialCode: "10001",
+            materialName: "物料A",
+            specs: "3*4",
+            planSum: 30,
+            workHour: 60,
+            completeSum: 15
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10002",
+            materialCode: "10002",
+            materialName: "物料B",
+            specs: "3*4",
+            planSum: 20,
+            workHour: 50,
+            completeSum: 18
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10001",
+            materialCode: "10001",
+            materialName: "物料A",
+            specs: "3*4",
+            planSum: 30,
+            workHour: 60,
+            completeSum: 15
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10002",
+            materialCode: "10002",
+            materialName: "物料B",
+            specs: "3*4",
+            planSum: 20,
+            workHour: 50,
+            completeSum: 18
+        });
+        taskList.push({
+            projectCode:"项目001",
+            orderSheetCode: "G10003",
+            materialCode: "10003",
+            materialName: "物料C",
+            specs: "3*4",
+            planSum: 90,
+            workHour: 10,
+            completeSum: 60
+        });
         $.each(taskList, function (index, item) {
             item.incompleteSum = item.planSum - item.completeSum;
             if (item.incompleteSum < 0)

pages/dashboard/line.html

@@ -62,19 +62,19 @@
                     <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:220px" id="charts_11"></div>
+                    <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:220px" id="charts_12"></div>
+                    <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:220px" id="charts_13"></div>
+                    <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
                 </div>
             </div>
             <div class="col-lg-6">
@@ -164,19 +164,19 @@
                     <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:200px" id="charts_22"></div>
+                    <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:200px" id="charts_23"></div>
+                    <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:200px" id="charts_24"></div>
+                    <div class="col-lg-12 col-md-12" style="height:210px" id="charts_24"></div>
                 </div>
             </div>
         </div>
@@ -187,12 +187,12 @@
     <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"></script>
-    <script src="/js/service/material.js"></script>
-    <script src="/js/service/product.js"></script>
-    <script src="/js/service/workhour.js"></script>
-    <script src="/js/service/produce-task.js"></script>
-    <script src="/js/content/mycharts.js"></script>
+    <script src="/js/service/person.js?_v=1"></script>
+    <script src="/js/service/material.js?_v=1"></script>
+    <script src="/js/service/product.js?_v=1"></script>
+    <script src="/js/service/workhour.js?_v=1"></script>
+    <script src="/js/service/produce-task.js?_v=1"></script>
+    <script src="/js/content/mycharts.js?_v=1"></script>
     <script type="text/javascript">
         var vm = new Vue({
             el: '#div-main',
@@ -219,8 +219,8 @@
 
                     ChartsService.initCommonPanel("charts_21", ServiceProduct.getDayProduceRate());
                     ChartsService.initCommonPie("charts_22", ServiceWorkhour.getDayByMaterial());
-                    ChartsService.initCommonPie("charts_23", ServiceProduceTask.getDayCompleteInfo());
-                    ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance());
+                    ChartsService.initCommonPie("charts_23", ServiceProduceTask.getDayCompleteInfo(), [ '#ff9f7f', '#37a2da']);
+                    ChartsService.initCommonPie("charts_24", ServicePerson.getDayAttendance(), [ '#37a2da','#ff9f7f']);
                     this.loadData();
                     // 开启定时器
                     this.timer_short = setInterval(this.scrollData, 5000);
@@ -262,7 +262,7 @@
                     const dayProduceTaskList = ServiceProduceTask.getDayList();
                     this.cacheDataObject.dayProduceTaskList = {
                         data: dayProduceTaskList,
-                        pagesize: 15,
+                        pagesize: 14,
                         pageindex: 0
                     }
                     this.dayProduceTaskList = dayProduceTaskList.slice(0, this.cacheDataObject