diff --git a/src/views/bigScreen/bxerp/lengjiagongdept.vue b/src/views/bigScreen/bxerp/lengjiagongdept.vue index bbdb6995..02d8aeea 100644 --- a/src/views/bigScreen/bxerp/lengjiagongdept.vue +++ b/src/views/bigScreen/bxerp/lengjiagongdept.vue @@ -5,77 +5,16 @@
{{ currentDay }} {{ currentTime }}
- - - -
本月产量
-
123
-
-
- - -
今日产量
-
123
-
-
- - -
今日工序报工量
-
123
-
-
- - -
在产产品数
-
123
-
-
- - -
本月完工工单
-
123
-
-
- - -
本月计划产量
-
123
-
-
- - -
本月产量
-
123
-
-
- - -
本月产量
-
123
-
-
-
- - - -
在制工序数
-
123
-
-
- - -
今日完成工序
-
123
-
-
-
-
+
车间各工段生产产品数
- +
+ +
+
@@ -88,6 +27,32 @@
+ + + +
在产产品数
+
123
+
+
+ + +
本月计划产量
+
123
+
+
+ + +
本月产量
+
123
+
+
+ + +
今日产量
+
123
+
+
+
车间工段任务展示
@@ -117,6 +82,18 @@
123
+ + +
在制工单数
+
123
+
+
+ + +
本月交付数
+
123
+
+
@@ -355,6 +332,63 @@ export default { } ] }, + barOption: { + grid: { + top: "1%", + left: "10%", + bottom: "5%", + containLabel: true + }, + xAxis: { + splitLine: { + show:false + }, + }, + yAxis: [ + { + axisLine: { + show: false + }, + axisTick: { + show: false + }, + axisLabel: { + color: "#fff" + }, + splitLine: { + show:false + }, + type: 'category', + inverse: true, // 反转坐标轴 + data: [] + } + ], + series: [ + { + name: '柱状图', + type: 'bar', + data: [], + barCategoryGap: 50, + barWidth: 10, + itemStyle: { + normal: { + barBorderRadius: 5, + color: function (params) { + return myColor[params.dataIndex]; + } + }, + label: { + normal: { + show: true, + // position: "outside", + color: "#fff", + formatter: "{a}" + } + } + }, + } + ] + }, tableHeight: 100, speed: 2000, time: null, @@ -495,6 +529,8 @@ export default { that.getmgroupMaterial(item.name); //工段太多了,暂时不显示全部,只显示有数据的工段 // that.config_left1.data.push({name:item.name,value:0}); + that.barOption.yAxis[0].data.push(item.name); + that.barOption.series[0].data.push(0); }) } }); diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue new file mode 100644 index 00000000..36a0398a --- /dev/null +++ b/src/views/statistics/bxerp/cpccjc.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/statistics/bxerp/lasi.vue b/src/views/statistics/bxerp/cpwgfj1.vue similarity index 60% rename from src/views/statistics/bxerp/lasi.vue rename to src/views/statistics/bxerp/cpwgfj1.vue index 659f0e3c..ac2313f3 100644 --- a/src/views/statistics/bxerp/lasi.vue +++ b/src/views/statistics/bxerp/cpwgfj1.vue @@ -3,26 +3,15 @@
+ - - 导出 + >导出
@@ -45,111 +35,114 @@ stripe > - + + - + @@ -171,7 +164,7 @@ @@ -185,15 +178,13 @@ export default { data() { return { params: { - ordering:'-create_time', - - querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], + ordering:'data__成品外观复检一_批次号', + querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]], }, query:{ batch__contains:'', last_time__gte:'', last_time__lte:'', - }, apiObj: this.$API.wpm.wpr.query, options:[], @@ -203,7 +194,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]]; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -217,26 +208,17 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1); } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2); } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.params.querys = querys; + this.$refs.table.queryData(that.params); }, getCountQt(data,type){ let count_qt = 0,count = 0; diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue new file mode 100644 index 00000000..b327b9c9 --- /dev/null +++ b/src/views/statistics/bxerp/cpwgfj2.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue new file mode 100644 index 00000000..e019bb03 --- /dev/null +++ b/src/views/statistics/bxerp/cpwgnzcj.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue new file mode 100644 index 00000000..4464e7f8 --- /dev/null +++ b/src/views/statistics/bxerp/cpxnjy.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue new file mode 100644 index 00000000..b6cf108f --- /dev/null +++ b/src/views/statistics/bxerp/cpzj.vue @@ -0,0 +1,376 @@ + + + + + diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue new file mode 100644 index 00000000..a80915e6 --- /dev/null +++ b/src/views/statistics/bxerp/fenjian.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue index 2f4859cf..fc5a85fd 100644 --- a/src/views/statistics/bxerp/maopi.vue +++ b/src/views/statistics/bxerp/maopi.vue @@ -3,11 +3,16 @@
- + + + + - @@ -189,14 +196,13 @@ export default { data() { return { params: { - ordering:'create_time', + ordering:'data__毛坯检测_批次号', querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], }, query:{ batch__contains:'', last_time__gte:'', last_time__lte:'', - }, apiObj: this.$API.wpm.wpr.query, options:[], @@ -206,7 +212,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]]; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -220,26 +226,17 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1); } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2); } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.params.querys = querys; + this.$refs.table.queryData(that.params); }, getCountQt(data,type){ let count_qt = 0,count = 0; diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue index 96018b8a..02fc6985 100644 --- a/src/views/statistics/bxerp/niuzhuan.vue +++ b/src/views/statistics/bxerp/niuzhuan.vue @@ -3,11 +3,16 @@
- + + + + @@ -56,24 +66,24 @@ @@ -81,51 +91,51 @@ @@ -133,28 +143,28 @@ @@ -162,39 +172,39 @@ @@ -208,9 +218,11 @@ export default { data() { return { params: { - ordering:'-create_time', - - querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭转检测_批次号"}]], + ordering:'data__扭后检测_批次号', + querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]], + }, + querys:{ + ordering:'-create_time' }, query:{ batch__contains:'', @@ -226,7 +238,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = []; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -240,31 +252,19 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]] + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1) } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2) } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.querys.querys = querys; + this.$refs.table.queryData(that.querys); }, - getCountQt(data,type){ - let count_qt = 0,count = 0; - - } }, }; diff --git a/src/views/statistics/bxerp/shenjiagong.vue b/src/views/statistics/bxerp/shenjiagong.vue deleted file mode 100644 index 7748a8e2..00000000 --- a/src/views/statistics/bxerp/shenjiagong.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue new file mode 100644 index 00000000..0d3caaf3 --- /dev/null +++ b/src/views/statistics/bxerp/zhongjian1.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue new file mode 100644 index 00000000..d5d8a07f --- /dev/null +++ b/src/views/statistics/bxerp/zhongjian2.vue @@ -0,0 +1,316 @@ + + + + +