1

js/session.js

@@ -88,11 +88,11 @@ function getQueryVariable(variable){
 }
 
 
-function beginFun(chartsID,dataMap,autoTime,timeName){
-    return function(){autoInitDate(chartsID,dataMap,autoTime,timeName)} 
+function beginFun(chartsID,dataMap,autoTime,timeName,grid){
+    return function(){autoInitDate(chartsID,dataMap,autoTime,timeName,grid)} 
 }
 
-function autoInitDate(chartsID,dataMap,autoTime,timeName){
+function autoInitDate(chartsID,dataMap,autoTime,timeName,grid){
     let DataList = [];
     for(let key in dataMap) {
         DataList.push([key, dataMap[key]]);
@@ -101,11 +101,11 @@ function autoInitDate(chartsID,dataMap,autoTime,timeName){
         return;
     }
     
-    timeName = setInterval(beginFun2(chartsID,DataList,timeName),autoTime);
+    timeName = setInterval(beginFun2(chartsID,DataList,timeName,grid),autoTime);
     
 }
 
-function beginFun2(chartsID,DataList,timeName){
+function beginFun2(chartsID,DataList,timeName,grid){
 
     let lsit = DataList.slice(pageIndex, pageSize);
     pageIndex = pageSize;
@@ -114,12 +114,12 @@ function beginFun2(chartsID,DataList,timeName){
     for(let key in lsit) {
         map[lsit[key][0]] = lsit[key][1];
     }
-    ChartsService.initCommonBar(chartsID,map);
+    ChartsService.initCommonBar(chartsID,map,grid);
 
-    return function(){autoLoadDate(chartsID,DataList,timeName)} 
+    return function(){autoLoadDate(chartsID,DataList,timeName,grid)} 
 }
 
-function autoLoadDate(chartsID,DataList,timeName){
+function autoLoadDate(chartsID,DataList,timeName,grid){
    
     if(DataList.length <= initSize){
         clearInterval(timeName);
@@ -135,5 +135,5 @@ function autoLoadDate(chartsID,DataList,timeName){
     for(let key in lsit) {
         map[lsit[key][0]] = lsit[key][1];
     }
-    ChartsService.initCommonBar(chartsID,map);
+    ChartsService.initCommonBar(chartsID,map,grid);
 }

pages/dashboard/warehouse.html

@@ -52,7 +52,7 @@
                     </div>
                 </div>
                 <div class="row"  style="height: 20%;">
-                    <div class="person-div" v-for="user in userList" style="padding: 0px 30px;">
+                    <div class="person-div" v-for="user in userList" style="text-align: center;margin-left:7%;">
                         <div>
                             <img v-bind:src="user.avatar" border="0" />
                         </div>
@@ -441,8 +441,8 @@
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
         const monthSend = ServiceProduct.getMonthSend();
         const stockDate = ServiceProduct.getStockList();
-        setTimeout(beginFun("charts_11",monthSend,10000,"123123"),500);
-        setTimeout(beginFun("charts_22",stockDate,10000,"1231231"),500);
+        setTimeout(beginFun("charts_11",monthSend,10000,"123123",ChartsService.getGridSpanSmall()),500);
+        setTimeout(beginFun("charts_22",stockDate,10000,"1231231",ChartsService.getGridSpanSmall()),500);
         // var interval = setInterval(getMonthSendData,10000);//项目月发货统计
         // var interval1 = setInterval(getMonthSendData1,10000);//成品库存