From 89940ac59278b79d84dbe9680dd59970721dca58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 10:42:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E4=B8=AD=20=E6=8C=89=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index 5fcdc29e..cd699fcb 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -1256,7 +1256,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow } if(scope.otherForm){ //展开了更多 - scope.search.invWhName = scope.dropDownDefault.warehouse.whName; //仓库 + // scope.search.invWhName = scope.dropDownDefault.warehouse.whName; //仓库 scope.search.invVehicleSpecName = scope.dropDownDefault.vehicleSpec.name; //车型 scope.search.invCustomerName = scope.dropDownDefault.shipper.customerId ? scope.dropDownDefault.shipper.customerId.name : ''; //货主 return scope.search; -- Gitee From 6c59805ade53a0514bbf5fec59b650def14566b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 14:40:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=A4=87=E6=96=99?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=8A=A0=E8=BD=BD=E6=97=B6=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index c5a2e3ec..521692ce 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -88,7 +88,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.search.otStatus = scope.dropDownDefault.status.value; //出库状态 scope.search.otVehicleSpecName = scope.dropDownDefault.vehicleSpec.name; //车型 scope.search.otEstimateLane = scope.dropDownDefaults.otEstimateLane.elName; //装车道 - scope.search.otDriver = scope.dropDownDefault.driver.id; //备料司机id + scope.search.otDriver = scope.dropDownDefault.driver?scope.dropDownDefault.driver.id:''; //备料司机id scope.search.otQuitFlag = scope.dropDownDefault.quitTask.value; //是否退库 return scope.search; }else{ //没有展开 -- Gitee From f067e358ee4ce95aa584c07fb3e74aa78f9037cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 14:58:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E7=8E=87=E7=BA=BF=E9=A2=9C=E8=89=B2=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/d.ctrl.js | 2 +- public/js/ctrl/p.ctrl.js | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index 7e5c9b45..aa769256 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -32,7 +32,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 3e7b478d..f42e7a29 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -9,7 +9,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic title: { x: 'center', text: '提车推移图', - subtext:'更新时间：2017-11-15 10:28:34', + subtext:'', textStyle: { color: '#fff', fontSize: '30' @@ -33,7 +33,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', @@ -109,7 +109,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -122,7 +122,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -135,7 +135,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -188,7 +188,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', @@ -436,7 +436,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic // } }, {value: 0, name: '管控'}, - {value: 0, name: '暂运'}, + {value: 0, name: '暂运'} ], itemStyle: { emphasis: { @@ -528,7 +528,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -584,9 +584,6 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic var $_bWidth = $('#bs_pc_tb1').width(); var $_bHeight = $('#bs_pc_tb1').height(); - console.log('加载了一次....'); - console.log('part的大小-->width:' + bWidth + ',height:' + bHeight); - var canvasBox = document.getElementsByClassName('bs_pc_canvasBox'); for (var i = 0; i < canvasBox.length; i++) { @@ -649,7 +646,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic $scope.pt1.legend.data = temp; // 加载条件注释 $scope.pt1.xAxis[0].data = r_d[0].date; // 加载x轴数据 - var update = '更新时间:' + $rootScope.getNowFormatDate(); + var update = '更新时间: ' + $rootScope.getNowFormatDate(); $scope.pt1.title.subtext = update; $rootScope.bs_load_1($scope.pt1, null, null, null); } -- Gitee From ca13a4b428d60612ce5aa3677671b30c8ec9bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 15:31:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=20=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=8E=A8=E7=A7=BB=E5=9B=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/p.ctrl.js | 75 +++++++++------------------------------- 1 file changed, 17 insertions(+), 58 deletions(-) diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index f42e7a29..1c151a1a 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -519,62 +519,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic } } ], - series: [ - { - name: '', - type: 'bar', - stack: 'transport', - data: [0, 0, 0, 0, 0, 0, 0], - itemStyle: { - normal: { - label: { - show: true - } - } - } - }, - { - name: '', - type: 'bar', - stack: 'transport', - data: [0, 0, 0, 0, 0, 0, 0], - itemStyle: { - normal: { - label: { - show: true - } - } - } - }, - { - name: '', - type: 'bar', - // barWidth : 5, - stack: 'transport', - data: [0, 0, 0, 0, 0, 0, 0], - itemStyle: { - normal: { - label: { - show: true - } - } - } - }, - // { - // name: '', - // type: 'bar', - // // barWidth : 5, - // stack: 'transport', - // data: [0, 0, 0, 0, 0, 0, 0], - // itemStyle: { - // normal: { - // label: { - // show: true - // } - // } - // } - // } - ] + series: [] }; $rootScope.bs_load_1 = function(a,b,c,d){ @@ -704,8 +649,22 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic var pt_D = $scope.pt4.series; var temp = []; for (var i = 0; i < r_d.length; i++) { - pt_D[i].data = r_d[i].data; - pt_D[i].name = r_d[i].name; // 加载柱状图 + var obj = { + name: '', + type: 'bar', + stack: 'transport', + data: [0, 0, 0, 0, 0, 0, 0], + itemStyle: { + normal: { + label: { + show: true + } + } + } + }; + obj.data = r_d[i].data; + obj.name = r_d[i].name; // 加载柱状图 + pt_D.push(obj); temp.push(r_d[i].name); } $scope.pt4.legend.data = temp; // 加载条件注释 -- Gitee