Procházet zdrojové kódy

看板计划类柱状图调整

cyy před 2 roky
rodič
revize
f30f57ac4a

+ 10 - 1
src/views/statistics/index.vue

@@ -584,7 +584,7 @@
           }).join(",");
           // console.log(this.quality1,'bumnebumen')
           for (let i = 0; i < this.quality1.length; i++) {
-            let mid = {'NAME_':this.quality1[i].name_,'numA':0,'num':0,'chu':0}
+            let mid = {'NAME_':this.quality1[i].name_,'numA':0,'num':0,'wnum':0,'chu':0}
             this.allBuMen.push(mid)
           }
           // console.log(this.allBuMen,'2434465565665656rterterte')
@@ -1131,6 +1131,15 @@
     justify-content: center;
   }
 </style>
+<style lang="less" scoped>
+/deep/ .el-range-separator{
+  color: #fff;
+}
+/deep/ .el-range-input{
+  background-color: rgba(0,0,0,0);
+  color: #fff;
+}
+</style>
 <style lang="scss">
 .el-year-table .today .cell {
   color: #606266 !important;

+ 6 - 7
src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -76,15 +76,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -157,12 +156,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s12fengXianCol.vue

@@ -80,15 +80,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -161,12 +160,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s14bufuhexiangCol.vue

@@ -80,15 +80,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -161,12 +160,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s15tousuCol.vue

@@ -80,15 +80,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -161,12 +160,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -76,15 +76,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -157,12 +156,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -78,15 +78,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -159,12 +158,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s2manYiDuPro.vue

@@ -79,15 +79,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -160,12 +159,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 6
src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -78,14 +78,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-					        return  params.value[params.seriesName]+'%'
+					        return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -158,12 +158,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 6
src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -77,14 +77,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-					        return  params.value[params.seriesName]+'%'
+					        return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -157,12 +157,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 6
src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -78,14 +78,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-					        return  params.value[params.seriesName]+'%'
+					        return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -158,12 +158,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 6
src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -76,14 +76,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-					        return  params.value[params.seriesName]+'%'
+					        return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -156,12 +156,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 6 - 7
src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -80,15 +80,14 @@
         let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
-          if(i==this.data.num.title.length-2){
+          if(i==this.data.num.title.length-3){
             barNum.push({
               type: 'bar',
               itemStyle: {color: barColor[i]},
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                // console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
-					        return  params.value[params.seriesName]+'%'
+                  return  params.data.chu+'%\n'+params.value[params.seriesName]
 					      },
                 position: this.direction=='x'?'right':'top',
                 textStyle:{
@@ -161,12 +160,12 @@
                 },
                 top:"5%",
                 formatter: function (name) {
-                  if(name === 'chu'){
-                    return '完成率(%)';
+                  if(name === 'wnum'){
+                    return '未完成数量';
                   }else if(name === 'num'){
-                    return '已完成数量';
+                    return '已完成数量(完成率)';
                   }else if(name === 'numA'){
-                    return '未完成数量';
+                    return '计划数量';
                   }
                     
                 }

+ 1 - 1
src/views/statistics/js/selectDB.js

@@ -27,7 +27,7 @@ export const gethechaMGObj = (end,info)=>{
 //   return "select COUNT(t_ndnlyzsysjbdjhzb.id_) as num from t_ndnlyzsysjbdjhzb LEFT JOIN t_nlyzsysjbdhdsyxhcb on t_ndnlyzsysjbdjhzb.id_=t_nlyzsysjbdhdsyxhcb.xiang_mu_ming_che WHERE t_nlyzsysjbdhdsyxhcb.shi_fou_guo_shen_ = '1' and  YEAR(t_ndnlyzsysjbdjhzb.create_time_)= "+end+" UNION all select COUNT(id_) as snum from t_ndnlyzsysjbdjhzb where  YEAR(create_time_)="+end
 // }
 export const getyangPinCaiJiObj = (end,info)=>{
-  return "select	t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET( '项', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0 	AND FIND_IN_SET( '次', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0,SUM( t_zlzbpjzb.shi_ji_shu_zhi_ ),AVG( t_zlzbpjzb.shi_ji_shu_zhi_ )),2) AS location,t_zlzbpjb.bian_zhi_bu_men_ AS bzbm,DATE_FORMAT( t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m' ) AS bzsj FROM	t_zlzbpjzb	LEFT JOIN t_zlzbpjb ON t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ WHERE	FIND_IN_SET( t_zlzbpjb.bian_zhi_bu_men_, '"+info+"' ) 	AND t_zlzbpjb.shi_fou_guo_shen_ = '已完成' 	AND t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' 	AND '"+end[1]+"' GROUP BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao ORDER BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao"
+  return "select t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET( '项', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0 	AND FIND_IN_SET( '次', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0,SUM( t_zlzbpjzb.shi_ji_shu_zhi_ ),AVG( t_zlzbpjzb.shi_ji_shu_zhi_ )),2) AS location,t_zlzbpjb.bian_zhi_bu_men_ AS bzbm,DATE_FORMAT( t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m' ) AS bzsj FROM	t_zlzbpjzb	LEFT JOIN t_zlzbpjb ON t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ WHERE	FIND_IN_SET( t_zlzbpjb.bian_zhi_bu_men_, '"+info+"' ) 	AND t_zlzbpjb.shi_fou_guo_shen_ = '已完成' 	AND t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' 	AND '"+end[1]+"' GROUP BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao ORDER BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao"
 }
 export const getzongZLMBObj = (end,info)=>{
   return "select t_zlzbpjzb.*,IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjzb.zhi_liang_mu_biao"

+ 24 - 12
src/views/statistics/sendDatas.js

@@ -59,13 +59,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.jiaoyanMGObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.jiaoyanMGObj[i].NAME_ )
                                 mid[midI].numA = this.jiaoyanMGObj[i].numA
                                 mid[midI].num = this.jiaoyanMGObj[i].num
+                                mid[midI].wnum = this.jiaoyanMGObj[i].numA-this.jiaoyanMGObj[i].num
                                 mid[midI].chu = this.jiaoyanMGObj[i].chu
                         }
                         return {
@@ -94,13 +95,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.hechaMGObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.hechaMGObj[i].NAME_ )
                                 mid[midI].numA = this.hechaMGObj[i].numA
                                 mid[midI].num = this.hechaMGObj[i].num
+                                mid[midI].wnum = this.hechaMGObj[i].numA-this.hechaMGObj[i].num
                                 mid[midI].chu = this.hechaMGObj[i].chu
                         }
                         return {
@@ -129,13 +131,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.waibuObjfb.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.waibuObjfb[i].NAME_ )
                                 mid[midI].numA = this.waibuObjfb[i].numA
                                 mid[midI].num = this.waibuObjfb[i].num
+                                mid[midI].wnum = this.waibuObjfb[i].numA-this.waibuObjfb[i].num
                                 mid[midI].chu = this.waibuObjfb[i].chu
                         }
                         return {
@@ -275,12 +278,13 @@ export default {
                         }
                 },
                 getbzJunZhujNum(){
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.gaijinxiangObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.gaijinxiangObj[i].NAME_ )
                                 mid[midI].numA = this.gaijinxiangObj[i].numA
                                 mid[midI].num = this.gaijinxiangObj[i].num
+                                mid[midI].wnum = this.gaijinxiangObj[i].numA-this.gaijinxiangObj[i].num
                                 mid[midI].chu = this.gaijinxiangObj[i].chu
                         }
                         return {
@@ -372,13 +376,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.guanshenfbObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.guanshenfbObj[i].NAME_ )
                                 mid[midI].numA = this.guanshenfbObj[i].numA
                                 mid[midI].num = this.guanshenfbObj[i].num
+                                mid[midI].wnum = this.guanshenfbObj[i].numA-this.guanshenfbObj[i].num
                                 mid[midI].chu = this.guanshenfbObj[i].chu
                         }
                         return {
@@ -459,13 +464,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.neishenfbObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.neishenfbObj[i].NAME_ )
                                 mid[midI].numA = this.neishenfbObj[i].numA
                                 mid[midI].num = this.neishenfbObj[i].num
+                                mid[midI].wnum = this.neishenfbObj[i].numA-this.neishenfbObj[i].num
                                 mid[midI].chu = this.neishenfbObj[i].chu
                         }
                         return {
@@ -496,13 +502,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.yingjifbObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.yingjifbObj[i].NAME_ )
                                 mid[midI].numA = this.yingjifbObj[i].numA
                                 mid[midI].num = this.yingjifbObj[i].num
+                                mid[midI].wnum = this.yingjifbObj[i].numA-this.yingjifbObj[i].num
                                 mid[midI].chu = this.yingjifbObj[i].chu
                         }
                         return {
@@ -536,13 +543,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.zaigangrenyuanfb.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.zaigangrenyuanfb[i].NAME_ )
                                 mid[midI].numA = this.zaigangrenyuanfb[i].numA
                                 mid[midI].num = this.zaigangrenyuanfb[i].num
+                                mid[midI].wnum = this.zaigangrenyuanfb[i].numA-this.zaigangrenyuanfb[i].num
                                 mid[midI].chu = this.zaigangrenyuanfb[i].chu
                         }
                         return {
@@ -579,13 +587,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.gangqianpeixunfb.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.gangqianpeixunfb[i].NAME_ )
                                 mid[midI].numA = this.gangqianpeixunfb[i].numA
                                 mid[midI].num = this.gangqianpeixunfb[i].num
+                                mid[midI].wnum = this.gangqianpeixunfb[i].numA-this.gangqianpeixunfb[i].num
                                 mid[midI].chu = this.gangqianpeixunfb[i].chu
                         }
                         return {
@@ -657,13 +666,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.neibuObjfb.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.neibuObjfb[i].NAME_ )
                                 mid[midI].numA = this.neibuObjfb[i].numA
                                 mid[midI].num = this.neibuObjfb[i].num
+                                mid[midI].wnum = this.neibuObjfb[i].numA-this.neibuObjfb[i].num
                                 mid[midI].chu = this.neibuObjfb[i].chu
                         }
                         return {
@@ -691,13 +701,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.fengxianfbObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.fengxianfbObj[i].NAME_ )
                                 mid[midI].numA = this.fengxianfbObj[i].numA
                                 mid[midI].num = this.fengxianfbObj[i].num
+                                mid[midI].wnum = this.fengxianfbObj[i].numA-this.fengxianfbObj[i].num
                                 mid[midI].chu = this.fengxianfbObj[i].chu
                         }
                         return {
@@ -711,13 +722,14 @@ export default {
                         // let fenshuzu = []
                         // fenshuzu = this.buhegelvObj
                         
-                        let title = ['NAME_','numA','num','chu']
+                        let title = ['NAME_','numA','num','wnum']
 
                         let mid = JSON.parse(JSON.stringify(this.allBuMen))
                         for (let i = 0; i < this.bufuheObj.length; i++) {
                                 let midI = mid.findIndex(v => v.NAME_ == this.bufuheObj[i].NAME_ )
                                 mid[midI].numA = this.bufuheObj[i].numA
                                 mid[midI].num = this.bufuheObj[i].num
+                                mid[midI].wnum = this.bufuheObj[i].numA-this.bufuheObj[i].num
                                 mid[midI].chu = this.bufuheObj[i].chu
                         }
                         return {