Change stuff and realtime JS made

dapingmu.html

@@ -334,14 +334,38 @@
             var faildata=[];
             var ratedata=[];
             var failmax=0;
+            var passmax=0;
+            var iddata=[];
+            var summax=0;
+            var stackmax=0;
+            var ratemax=0;
             for (i = 0; i < passeverynum.length; i++) {
                 passdata.push(passeverynum[i]);
                 faildata.push(faileverynum[i]);
-                stackdata.push(0);
-                ratedata.push(failrate[i])
-                if (failmax < ratedata[i]) {
-                    failmax = ratedata[i];
+                stackdata.push(stackeverynum[i]);
+                ratedata.push(failrate[i]);
+                iddata.push(flownum[i]);
+
+                if (ratemax < ratedata[i]) {
+                    ratemax = ratedata[i];
+                }
+                if(passmax<passeverynum[i]){
+                    passmax=passeverynum[i];
+                }
+                if(failmax<passeverynum[i]){
+                    failmax=passeverynum[i];
                 }
+                if(stackmax<passeverynum[i]){
+                    stackmax=passeverynum[i];
+                }
+
+            }
+            if(passmax<failmax)
+            {
+                passmax=failmax
+            }
+            if(passmax<stackmax){
+                passmax=stackmax;
             }
 
             showEachSpot();
@@ -368,7 +392,8 @@
                         style: {
                             fontSize: '1.5em'
                         }
-                    }
+                    },
+                    categories: iddata,
                 }],
                 yAxis: [{ // Primary yAxis
                     labels: {
@@ -379,7 +404,7 @@
                         }
                     },
                     min: 0,
-                    max: 10000,
+                    max: passmax*1.5,
                     title: {
 
                         style: {
@@ -439,7 +464,8 @@
                         style: {
                             fontSize: '1.5em'
                         }
-                    }
+                    },
+                    categories: iddata,
                 }],
                 yAxis: [ { // Secondary yAxis
                     title: {
@@ -450,7 +476,7 @@
                         }
                     },
                     min: 0,
-                    max: 1.5 * failmax,
+                    max: 1.5 * ratemax,
                     labels: {
                         formatter: function () {
                             return Math.floor(this.value) + "%";
@@ -492,13 +518,39 @@
             var passdata=[];
             var faildata=[];
             var ratedata=[];
+            var failmax=0;
+            var passmax=0;
+            var iddata=[];
+            var summax=0;
+            var stackmax=0;
+            var ratemax=0;
             for (i = 0; i < passeverynum.length; i++) {
                 passdata.push(passeverynum[i]);
                 faildata.push(faileverynum[i]);
-                stackdata.push(0);
-                ratedata.push(failrate[i])
+                stackdata.push(stackeverynum[i]);
+                ratedata.push(failrate[i]);
+                iddata.push(flownum[i]);
+                if (ratemax < ratedata[i]) {
+                    ratemax = ratedata[i];
+                }
+                if(passmax<passeverynum[i]){
+                    passmax=passeverynum[i];
+                }
+                if(failmax<passeverynum[i]){
+                    failmax=passeverynum[i];
+                }
+                if(stackmax<passeverynum[i]){
+                    stackmax=passeverynum[i];
+                }
 
             }
+            if(passmax<failmax)
+            {
+                passmax=failmax
+            }
+            if(passmax<stackmax){
+                passmax=stackmax;
+            }
 
 
             // https://api.hcharts.cn/highcharts#Series.addPoint;

js/basic.js

@@ -66,12 +66,12 @@ var badid=[];
 var badfailrate=[];
 var t=0;
 var n=0;
-var flowID=1;
+var workID=[];
 function firsttime_load_spots_data() {
-    get_data("fcWorkRaw/allSpots?flowId=" + thisPageFlow, first_success)
+    get_data("fcWorkScheduleLoad/list?scheduleId=" + scheduleId, first_success)
 }
 function secondtime_load_spots_data() {
-    get_data("fcBiFlowDaily/list?type=" + num +"&flowId="+flowID, second_success);
+    get_data("fcBiFlowDaily/list?type=" + num +"&flowId="+flowId, second_success);
     num++;
 }
 function chart_load_spots_data() {
@@ -88,31 +88,54 @@ function first_success(obj, sta) {
     //在这里排序 spo\
     console.log(" output : ");
     console.log(output);
-    var i, j;
+    var i, j,k,z;
     failnum=0;
-    for (i = 0; i < output.length ; i++) {
-        passNumber[i] = output[i].passNum;
-        passnum=passNumber[i]
-    }
-    for (i = 0; i < output.length ; i++) {
-        failNumber[i] = output[i].failNum;
-        failnum=failNumber[i]+failnum;
+    var x=0;
+    var worksum=[];
+    workID[0]=output.list[0].userId;
+    passNumber[0]=0;
+    failNumber[0]=0;
+    stackeverynum[0]=0;
+    z=0;
+    for(i=1;i<output.list.length;i++){
+        var thisUid = output.list[i].userId;
+       x = 0;
+       for(j=0;j<workID.length;j++){
+           if(workID[j] === thisUid){
+               x=1;
+               break;
+           }
+       }
+       if(x===0){
+           workID.push(thisUid);
+       }
+
     }
-    for (i = 0; i < output.length ; i++) {
-        if (failNumber[i] + passNumber[i] == 0) {
-            failrate[i] = 0;
+    j=0;
+    for(k=0;k<workID.length;k++){
+        var uid = workID[k];
+        z=0;
+        for(i=0;i<output.list.length;i++){
+            if(uid===output.list[i].userId){
+                passNumber[k]=output.list[i].passNum+passNumber[j];
+                failNumber[k]=output.list[i].failNum+failNumber[j];
+                stackeverynum[k]=output.list[i].due+stackeverynum[j];
+                z++;
+            }
+        }
+        if (failNumber[k] + passNumber[k] == 0) {
+            failrate[k] = 0;
         }
         else {
-            failrate[i] = failNumber[i] / (failNumber[i] + passNumber[i]) * 100;
+            failrate[k] = failNumber[k] / (failNumber[k] + passNumber[k]) * 100;
 
         }
+        stackeverynum[k]=stackeverynum[k]/z;
+
+        ///
 
     }
-    stackeverynum[0] = 0;
-    for (i = 1; i < output.length ; i++) {
-        stackeverynum[i] = passNumber[i - 1] - passNumber[i] - failNumber[i];
-        stacknum = stackeverynum[i] + stacknum;
-    }
+
     for(i=1;i<5;i++) {
         secondtime_load_spots_data();
     }
@@ -125,7 +148,7 @@ function first_success(obj, sta) {
     showChart();
 
     setInterval(function(){
-        get_data("fcWorkRaw/allSpots?flowId=" + thisPageFlow, realtime_success);
+        get_data("fcWorkScheduleLoad/list?scheduleId=" + scheduleId, realtime_success);
     },1000);
 
 }
@@ -195,34 +218,62 @@ function chart1_success(obj, sta) {
 
 
 function realtime_success(obj, sta) {
-
     var output = first_parse(this, obj);
-    var i, j;
-    for (i = 0; i < output.length ; i++) {
-        passNumber[i] = output[i].passNum;
-    }
-    for (i = 0; i < output.length ; i++) {
-        failNumber[i] = output[i].failNum;
+    //在这里排序 spo\
+    console.log(" output : ");
+    console.log(output);
+    var i, j,k,z;
+    failnum=0;
+    var x=0;
+    var worksum=[];
+    workID[0]=output.list[0].userId;
+    passNumber[0]=0;
+    failNumber[0]=0;
+    stackeverynum[0]=0;
+    z=0;
+    for(i=1;i<output.list.length;i++){
+        var thisUid = output.list[i].userId;
+        x = 0;
+        for(j=0;j<workID.length;j++){
+            if(workID[j] === thisUid){
+                x=1;
+                break;
+            }
+        }
+        if(x===0){
+            workID.push(thisUid);
+        }
+
     }
-    for (i = 0; i < output.length ; i++) {
-        if (failNumber[i] + passNumber[i] == 0) {
-            failrate[i] = 0;
+    j=0;
+    for(k=0;k<workID.length;k++){
+        var uid = workID[k];
+        z=0;
+        for(i=0;i<output.list.length;i++){
+            if(uid===output.list[i].userId){
+                passNumber[k]=output.list[i].passNum+passNumber[j];
+                failNumber[k]=output.list[i].failNum+failNumber[j];
+                stackeverynum[k]=output.list[i].due+stackeverynum[j];
+                z++;
+            }
+        }
+        if (failNumber[k] + passNumber[k] == 0) {
+            failrate[k] = 0;
         }
         else {
-            failrate[i] = failNumber[i] / (failNumber[i] + passNumber[i]) * 100;
+            failrate[k] = failNumber[k] / (failNumber[k] + passNumber[k]) * 100;
+
         }
+        stackeverynum[k]=stackeverynum[k]/z;
+
+        ///
 
-    }
-    stackeverynum[0] = 0;
-    for (i = 1; i < output.length ; i++) {
-        stackeverynum[i] = passNumber[i - 1] - passNumber[i] - failNumber[i];
-        stacknum = stackeverynum[i] + stacknum;
     }
     updateChart();
 
 }
 
-function on_load_success_spots(obj, status) {
+/*function on_load_success_spots(obj, status) {
     var spotsList = first_parse(this, obj);
     //在这里排序 spo\
     console.log("spot List : ");
@@ -247,11 +298,12 @@ function on_load_success_spots(obj, status) {
     }
 
     firsttime_load_spots_data();
-}
+}*/
 
 function on_document_load() {
     // First Step
-    get_data("fcSpot/list?flowId=" + thisPageFlow, on_load_success_spots)
+    //get_data("fcSpot/list?flowId=" + scheduleId, on_load_success_spots)
+    firsttime_load_spots_data();
 }
 
 

js/basic1.js

@@ -29,6 +29,7 @@ var badid=[];
 var badfailrate=[];
 var t=0;
 var n=0;
+var flownum=[];
 
 function on_fail(msg) {
     alert("很抱歉，网络错误，请查看Console");
@@ -69,7 +70,7 @@ function first_parse(ajax, obj) {
 
 function on_document_load() {
 
-    get_data("fcWorkRaw/allFlows" , on_load_success_spots)
+    get_data("fcWorkScheduleLoad/get" , on_load_success_spots)
 }
 
 function on_load_success_spots(obj, status) {
@@ -79,17 +80,13 @@ function on_load_success_spots(obj, status) {
     console.log(spotsList);
 
     var i, j, temp=[];
-        for (j = 0; j < spotsList.length-1  ; j++) {
-            if (spotsList[j].flowId > spotsList[j + 1].flowId) {
-                temp = spotsList[j];
-                spotsList[j] = spotsList[j + 1];
-                spotsList[j + 1] = temp;
-            }
-        }
+
     for (i = 0; i < spotsList.length ; i++) {
-        passeverynum[i] = spotsList[i].flowPass;
-        faileverynum[i] = spotsList[i].flowFail;
-        stackeverynum[i] = 0;
+        passeverynum[i] = spotsList[i].passNum;
+        faileverynum[i] = spotsList[i].failNum;
+        stackeverynum[i] = spotsList[i].due;
+        flownum[i]=spotsList[i].scheduleId;
+
     }
     for (i = 0; i < spotsList.length ; i++) {
         if (passeverynum[i] + faileverynum[i] == 0) {
@@ -110,7 +107,7 @@ function on_load_success_spots(obj, status) {
     showChart();
 
     setInterval(function(){
-        get_data("fcWorkRaw/allFlows" , realtime_success);
+        get_data("fcWorkScheduleLoad/get" , realtime_success);
     },1000);
 }
 
@@ -185,9 +182,10 @@ function realtime_success(obj, sta) {
     var output = first_parse(this, obj);
     var i, j;
     for (i = 0; i < output.length ; i++) {
-        passeverynum[i] = output[i].flowPass;
-        faileverynum[i] = output[i].flowFail;
-        stackeverynum[i] = 0
+        passeverynum[i] = output[i].passNum;
+        faileverynum[i] = output[i].failNum;
+        stackeverynum[i] = output[i].due;
+        flownum[i]=output[i].scheduleId;
     }
     for (i = 0; i < output.length ; i++) {
         if (passeverynum[i] + faileverynum[i] == 0) {

js/getparam.js

@@ -16,6 +16,7 @@ if(flowId == null || scheduleId == null){
 // 去除实际名字
 function getNames(workerIdList, chart){
     // return "张三";
+
 }
 
 function on_load_name_success(obj){

lazhang.html

@@ -94,204 +94,9 @@
         <div style="color: #ffffff"><img src="images/logo.jpg" style="width: 10%"> 深圳市度彼电子有限公司——</div>
         <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
     </div>
-     <!--   <div class="collapse navbar-collapse" id="navbar-collapse">
-            <ul class="nav navbar-nav navbar-right">
-                <!-- Call Search -->
-         <!--       <li><a href="javascript:void(0);" class="js-search" data-close="true"><i class="material-icons">search</i></a></li>
-                <!-- #END# Call Search -->
-                <!-- Notifications -->
-    <!--            <li class="dropdown">
-                    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
-                        <i class="material-icons">notifications</i>
-                        <span class="label-count">7</span>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li class="header">NOTIFICATIONS</li>
-                        <li class="body">
-                            <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; height: 254px;"><ul class="menu" style="overflow: hidden; width: auto; height: 254px;">
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-light-green">
-                                            <i class="material-icons">person_add</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4>12 new members joined</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 14 mins ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-cyan">
-                                            <i class="material-icons">add_shopping_cart</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4>4 sales made</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 22 mins ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-red">
-                                            <i class="material-icons">delete_forever</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4><b>Nancy Doe</b> deleted account</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 3 hours ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-orange">
-                                            <i class="material-icons">mode_edit</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4><b>Nancy</b> changed name</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 2 hours ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-blue-grey">
-                                            <i class="material-icons">comment</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4><b>John</b> commented your post</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 4 hours ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-light-green">
-                                            <i class="material-icons">cached</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4><b>John</b> updated status</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> 3 hours ago
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <div class="icon-circle bg-purple">
-                                            <i class="material-icons">settings</i>
-                                        </div>
-                                        <div class="menu-info">
-                                            <h4>Settings updated</h4>
-                                            <p>
-                                                <i class="material-icons">access_time</i> Yesterday
-                                            </p>
-                                        </div>
-                                    </a>
-                                </li>
-                            </ul><div class="slimScrollBar" style="background: rgba(0, 0, 0, 0.5); width: 4px; position: absolute; top: 0px; opacity: 0.4; display: block; border-radius: 0px; z-index: 99; right: 1px;"></div><div class="slimScrollRail" style="width: 4px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 0px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
-                        </li>
-                        <li class="footer">
-                            <a href="javascript:void(0);" class=" waves-effect waves-block">View All Notifications</a>
-                        </li>
-                    </ul>
-                </li>
-                <!-- #END# Notifications -->
-                <!-- Tasks -->
-    <!--           <li class="dropdown">
-                    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
-                        <i class="material-icons">flag</i>
-                        <span class="label-count">9</span>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li class="header">TASKS</li>
-                        <li class="body">
-                            <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; height: 254px;"><ul class="menu tasks" style="overflow: hidden; width: auto; height: 254px;">
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <h4>
-                                            Footer display issue
-                                            <small>32%</small>
-                                        </h4>
-                                        <div class="progress">
-                                            <div class="progress-bar bg-pink" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 32%">
-                                            </div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <h4>
-                                            Make new buttons
-                                            <small>45%</small>
-                                        </h4>
-                                        <div class="progress">
-                                            <div class="progress-bar bg-cyan" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 45%">
-                                            </div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <h4>
-                                            Create new dashboard
-                                            <small>54%</small>
-                                        </h4>
-                                        <div class="progress">
-                                            <div class="progress-bar bg-teal" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 54%">
-                                            </div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <h4>
-                                            Solve transition issue
-                                            <small>65%</small>
-                                        </h4>
-                                        <div class="progress">
-                                            <div class="progress-bar bg-orange" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 65%">
-                                            </div>
-                                        </div>
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="javascript:void(0);" class=" waves-effect waves-block">
-                                        <h4>
-                                            Answer GitHub questions
-                                            <small>92%</small>
-                                        </h4>
-                                        <div class="progress">
-                                            <div class="progress-bar bg-purple" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 92%">
-                                            </div>
-                                        </div>
-                                    </a>
-                                </li>
-                            </ul><div class="slimScrollBar" style="background: rgba(0, 0, 0, 0.5); width: 4px; position: absolute; top: 0px; opacity: 0.4; display: block; border-radius: 0px; z-index: 99; right: 1px;"></div><div class="slimScrollRail" style="width: 4px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 0px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
-                        </li>
-                        <li class="footer">
-                            <a href="javascript:void(0);" class=" waves-effect waves-block">View All Tasks</a>
-                        </li>
-                    </ul>
-                </li>
-                <!-- #END# Tasks -->
-          <!--      <li class="pull-right"><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
-            </ul>
-        </div> -->
 
 </nav>
-<section style="margin-top: 100px;color: #ffffff" style-height="30-1">
+<section style="margin-top: 100px;color: #ffffff" style-height="20">
     <div style="width: 38%;float: left">
         <div class="text-center">本拉产能统计</div>
         <table class="table table-bordered text-center" style="color: #ffffff">
@@ -396,170 +201,18 @@
         </table>
     </div>
 </section>
-<!--<nav class="navbar navbar-expand-lg navbar-light bg-light" style-height="10">-- >
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo01" aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
-        <a class="navbar-brand" href="#">Hidden brand</a>
-        <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
-            <li class="nav-item active">
-                <a class="nav-link" href="#">生产线<span>1</span>号 </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#"><span id="clockt"></span></a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" href="#">Disabled</a>
-            </li>
-        </ul>
-        <form class="form-inline my-2 my-lg-0">
-            <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
-            <button class="btn btn-outline-success my-2 my-sm-0" type="submit">下班</button>
-
-            <div class="dropdown">
-                <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown"
-                        aria-haspopup="true" aria-expanded="false" style="font-size: 0.5em">
-                    <div class="row">
-                        <div class="col-4">
-                            拉长
-                        </div>
-                        <div class="col-5">
-                            张三
-                        </div>
-                    </div>
-
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                    <li><a href="#">更改密码</a></li>
-                    <li><a href="#">退出登录</a></li>
-                </ul>
-            </div>
-        </form>
-    </div>
-</nav>-->
- <!--<section class="content" style="margin: 0 auto; margin-top: 100px;">
-    <!--<div class="row"></div>
-    <div class="container-fluid " style="margin-bottom: 1em;">
-        <div class="row text-center">
-            <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-                <div class="info-box bg-green hover-expand-effect" style="margin: 0;">
-                    <div class="icon">
-                        <i class="material-icons">equalizer</i>
-                    </div>
-                    <div class="content">
-                        <div class="row text-center" style="margin: 0 auto">
-                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">合格数:</div>
-                            <div class="number" style="font-size: 3em" id="test1"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-                <div class="info-box bg-red hover-expand-effect" style="margin: 0;">
-                    <div class="icon">
-                        <i class="material-icons">equalizer</i>
-                    </div>
-                    <div class="content">
-                        <div class="row text-center" style="margin: 0 auto">
-                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">不合格数:</div>
-                            <div class="number" style="font-size: 3em" id="test2"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-                <div class="info-box bg-lime hover-expand-effect" style="margin: 0;">
-                    <div class="icon">
-                        <i class="material-icons">brightness_low</i>
-                    </div>
-                    <div class="content">
-                        <div class="row text-center" style="margin: 0 auto">
-                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">不良率:</div>
-                            <div class="number" style="font-size: 3em" id="test3"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-                <div class="info-box bg-cyan hover-zoom-effect" style="margin: 0; ">
-                    <div class="icon">
-                        <i class="material-icons">access_alarm</i>
-                    </div>
-                    <div class="content">
-                        <div class="row text-center" style="margin: 0 auto">
-                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">堆积数:</div>
-                            <div class="number" style="font-size: 3em" id="test4"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
 
-        </div>
-    </div> -->
-    <!--<div class="container-fluid" style="margin-top: 0.5em;padding-top: 1em">
-
-        <!--  <div class="card" style-height="30-8" style="margin: 0 auto;">
-            --<div>
-                  <div class="" style="">
-                      <div class="table-responsive" style="width: 30%;float: left">
-                          <table class="table table-hover dashboard-task-infos">
-                              <thead>
-                              <tr style="border-bottom:3px solid black;">
-                                  <th>姓名(工号)</th>
-                                  <th>合格数</th>
-                                  <th>不合格数</th>
-
-                              </tr>
-                              </thead>
-                              <tbody id="rank-one">
-
-                              </tbody>
-                          </table>
-                      </div>
-                      <div class="table-responsive" style="width: 30%;float: left;padding-left: 5em">
-                          <table class="table table-hover dashboard-task-infos">
-                              <thead>
-                              <tr style="border-bottom:3px solid black;">
-                                  <th>姓名(工号)</th>
-                                  <th>合格数</th>
-                                  <th>不合格数</th>
-
-                              </tr>
-                              </thead>
-                              <tbody id="rank-two">
-
-                              </tbody>
-                          </table>
-                      </div>
-                      <div class="table-responsive" style="width: 30%;float: right">
-                          <table class="table table-hover dashboard-task-infos">
-                              <thead>
-                              <tr style="border-bottom:3px solid black;">
-                                  <th>姓名(工号)</th>
-                                  <th>合格数</th>
-                                  <th>不合格数</th>
-
-                              </tr>
-                              </thead>
-                              <tbody id="rank-three">
-
-                              </tbody>
-                          </table>
-                      </div>
-                  </div>
-              </div>
-          </div> -->
-<section>
-    <div class="row " style="height: 10em"></div>
+
+
+
 <div class="row" style-height="50-8">
     <div id="graph-1"></div>
-</div>
     <div class="row " style="height: 10em"></div>
-    <div class="row" style-height="30-2">
+    <div class="row" style-height="">
         <div id="graph-2"></div>
     </div>
-</section>
+</div>
+
 
 <!-- Jquery Core Js -->
 <script src="plugins/jquery/jquery.min.js"></script>
@@ -603,6 +256,7 @@
 <!-- Demo Js -->
 <script src="js/demo.js"></script>
 <script src="js/basic.js"></script>
+<script src="js/getparam.js"></script>
 
 <script>
     var timeday=["今日" ,"昨日" ,"本周" ,"本月"];
@@ -683,8 +337,6 @@
     }
 
 
-    var thisPageFlow = 1;
-
     function showChart() {
 
         var data = [];
@@ -693,6 +345,7 @@
         var failmax = 0;
         var passdata=[];
         var faildata=[];
+        var passmax=0;
 
         for (i = 0; i < passNumber.length; i++) {
             if (stackmax < stackeverynum[i]) {
@@ -701,6 +354,9 @@
             if (failmax < failrate[i]) {
                 failmax = failrate[i];
             }
+            if(passmax<passNumber[i]){
+                passmax=passNumber[i];
+            }
             data.push(stackeverynum[i]);
             ratedata.push(Math.floor(failrate[i]));
             passdata.push(passNumber[i]);
@@ -753,7 +409,7 @@
                     }
                 },
                 min: 0,
-                max: 10000,
+                max: passmax*1.5,
                 title: {
 
                     style: {
@@ -876,6 +532,7 @@
         var failmax = 0;
         var passdata=[];
         var faildata=[];
+        var passmax=0;
         for (i = 0; i < passNumber.length; i++) {
             if (stackmax < stackeverynum[i]) {
                 stackmax = stackeverynum[i];
@@ -883,6 +540,9 @@
             if (failmax < failrate[i]) {
                 failmax = failrate[i];
             }
+            if(passmax<passNumber[i]){
+                passmax=passNumber[i];
+            }
             data.push(stackeverynum[i]);
             ratedata.push(Math.floor(failrate[i]));
             passdata.push(passNumber[i]);
@@ -896,6 +556,12 @@
         stackAndFailChart.series[1].setData(faildata);
         stackAndFailChart.series[2].setData(data);
         FailChart.series[0].setData(ratedata);
+        if(failmax > FailChart.yAxis[0].getExtremes().max * 1.3 || failmax < FailChart.yAxis[0].getExtremes().max * 0.5) {
+            FailChart.yAxis[0].setExtremes(0, failmax*1.5);
+        }
+        if(passmax>stackAndFailChart.yAxis[0].getExtremes().max*1.3 || passmax<stackAndFailChart.yAxis[0].getExtremes().max*0.5) {
+            stackAndFailChart.yAxis[0].setExtremes(0, passmax*1.5);
+        }
 
 
          showEachSpot();
@@ -909,10 +575,6 @@
 
     $(document).ready(on_document_load);
 
-
-
-
-
     window.onresize = resizeAll;
 
     function resizeAll() {
@@ -923,15 +585,17 @@
         $('[style-height="30-8"]').height(window.innerHeight * 0.4 - 220);
         $('[style-height="30-1"]').each(function(one,items){$(items).height(window.innerHeight * 0.3)});
         $('[style-height="30-2"]').each(function(one,items){$(items).height(window.innerHeight * 0.2)});
+
+        $('[style-height="50-8"]').each(function(one,items){$(items).height(window.innerHeight * 0.5)});
         var graph = $("#graph-1");
         graph.width(window.innerWidth - 35);
-        graph.height(window.innerHeight / 3.333);
+        graph.height(window.innerHeight *0.2);
         if (graph.highcharts !== undefined) {
             graph.highcharts().reflow();
         }
         var graph = $("#graph-2");
         graph.width(window.innerWidth - 35);
-        graph.height(window.innerHeight / 3.333);
+        graph.height(window.innerHeight *0.2);
         if (graph.highcharts !== undefined) {
             graph.highcharts().reflow();
         }
@@ -943,18 +607,6 @@
 
     resizeAll();
 
-
-
-
-
-
-
-
-
-    init_names(flowId);
-
-
-
     //startClock();
 
 </script>