diff --git a/src/assets/css/layout.styl b/src/assets/css/layout.styl index 328e336..d85b8ac 100644 --- a/src/assets/css/layout.styl +++ b/src/assets/css/layout.styl @@ -44,8 +44,8 @@ border-color #03fcfd color #fff .current_page - background-color #049293 - border-color #049293 + background-color #02d0d0 + border-color #02d0d0 color #fff // 弹窗 diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index e9157c3..8a371a2 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -2946,6 +2946,13 @@ export const moldingTableDate = () => { return res } +// 分拣包装左 +// export const sortingAndPackagingPopover = () => post('api/cockpit/sortingAndPackagingPopover', {}) +export const sortingAndPackagingPopover = () => { + let res = {'code': 200, 'desc': '操作成功', 'result': {'SplitOrPalletizingList': [{'bom': '3012C1', 'is_full': '是', 'device_name': '压机1', 'qty': '270', 'mix_num': '20230606000', 'point_name': '分拣拆垛1对接位1', 'vehicle_code': '5070', 'point_code': 'FJCD01DJ01', 'point_status': '1', 'material_code': 'GBMAC3012C1'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣拆垛1对接位2', 'vehicle_code': '', 'point_code': 'FJCD01DJ02', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位1', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ01', 'point_status': '1', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位2', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ02', 'point_status': '1', 'material_code': '-'}], 'HalfSupportCacheList': [{'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}], 'DevicesInfoList': {'DT01': {'device_status': 2, 'device_name': '叠托位', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'DT01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJCDJXS01': {'device_status': 2, 'device_name': '分拣拆垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJCDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'RGV01': {'device_status': 2, 'device_name': 'RGV搬运车', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'RGV01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJMDJXS01': {'device_status': 2, 'device_name': '分拣码垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJMDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'CPJ01': {'device_status': 2, 'device_name': '拆盘机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'CPJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'BZJ01': {'device_status': 2, 'device_name': '包装机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'BZJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJRGCD01': {'device_status': 2, 'device_name': '分拣人工拆垛', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJRGCD01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}}}} + return res +} + // 分拣包装右 // export const sortingAndPackaging = () => post('api/cockpit/sortingAndPackaging', {}) export const sortingAndPackaging = () => { @@ -2955,19 +2962,19 @@ export const sortingAndPackaging = () => { 'result': { 'SortingDayList': [ { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '288', 'material_id': '1658742670023069696', 'material_code': 'GBMCZ3004M1' }, { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '270', 'material_id': '1655138063413809152', 'material_code': 'ZLMCZ1001C1' }, { - 'total_palletizing_qty': '0', + 'total_palletizing_qty': '100', 'total_stripping_qty': '576', 'material_id': '1659114773914193920', 'material_code': 'GBMCZ3004M1' diff --git a/src/images/workshop/liu.png b/src/images/workshop/liu.png deleted file mode 100644 index b6af125..0000000 Binary files a/src/images/workshop/liu.png and /dev/null differ diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index d4f19cf..9d3018c 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -161,9 +161,6 @@
-
@@ -1124,8 +1121,5 @@ export default { 100% { transform: rotateZ(-90deg) } -}.style_block - position absolute - _wh(calc(100% / 3), calc(100% / 3)) - background red +} diff --git a/src/pages/modules/processproduction/three.vue b/src/pages/modules/processproduction/three.vue index aa4a89e..353465d 100644 --- a/src/pages/modules/processproduction/three.vue +++ b/src/pages/modules/processproduction/three.vue @@ -10,8 +10,10 @@ // import two from './two.vue' // import one from '../homepage/one.vue' // import two from '../homepage/two.vue' -import one from '../takeshape/one.vue' -import two from '../takeshape/two.vue' +// import one from '../takeshape/one.vue' +// import two from '../takeshape/two.vue' +import one from '../sortpack/one.vue' +import two from '../sortpack/two.vue' // import one from '../hunniankunliao/one.vue' // import two from '../hunniankunliao/two.vue' // import one from '../firedry/one.vue' diff --git a/src/pages/modules/sortpack/one.vue b/src/pages/modules/sortpack/one.vue index 731620c..37bd16e 100644 --- a/src/pages/modules/sortpack/one.vue +++ b/src/pages/modules/sortpack/one.vue @@ -39,94 +39,283 @@
-
-
-
- -
+
+
+
+
-
-
- +
+
+
+ +
+
+ +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ + + + +
+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
-
- +
+
+
+
-
- +
+
+
+ +
+
+
+
-
- -
-
- -
-
- -
-
- -
-
- -
-
- +
+
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- +
+
+
-
-
- -
- +
+
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
1
+
2
+
3
+
4
+
5
+
6
+
+
+ + diff --git a/src/pages/modules/sortpack/two.vue b/src/pages/modules/sortpack/two.vue index 9a30c45..79dca37 100644 --- a/src/pages/modules/sortpack/two.vue +++ b/src/pages/modules/sortpack/two.vue @@ -8,7 +8,7 @@
-
+
当日拆码垛
@@ -16,7 +16,7 @@
-
+
当日成品
@@ -95,9 +95,9 @@
1
2
-
3
+
3
4
-
5
+
5
6
@@ -122,6 +122,8 @@ export default { interTime: this.$store.getters.setTime, timer: null, expand: false, + myCharts1: '', + myCharts2: '', SortingDayList: [], PackingAreaTaskList: [], HalfSupportCacheList: [], @@ -186,6 +188,307 @@ export default { this.PackingAreaTaskList = [...res.result.PackingAreaTaskList] this.HalfSupportCacheList = [...res.result.HalfSupportCacheList] this.CPDayList = [...res.result.CPDayList] + this.setEchart1() + this.setEchart2() + } + }, + setEchart1 () { + let barName = [] + let barData1 = [] + let barData2 = [] + this.SortingDayList.map(el => { + barName.push(el.material_code) + barData1.push(el.total_stripping_qty) + barData2.push(el.total_palletizing_qty) + }) + let option = { + grid: { + top: 50, + left: 0, + right: 0, + bottom: 0, + containLabel: true + }, + legend: { + icon: 'rect', + textStyle: { + color: '#fff', + fontSize: 14, + lineHeight: 14 + }, + itemGap: 30.86, + itemWidth: 14.16, + itemHeight: 7.38, + data: [{name: '拆垛数', itemStyle: {color: '#0E90FD'}}, {name: '码垛数', itemStyle: {color: '#33CCCC'}}] + }, + xAxis: { + type: 'category', + axisTick: { + show: false + }, + axisLine: { + show: true, + lineStyle: { + width: 2, + color: '#8FABBF' + } + }, + axisLabel: { + interval: 0, + textStyle: { + color: '#8FABBF', + fontSize: 16 + } + // rotate: 50 + }, + data: barName + }, + yAxis: { + type: 'value', + name: '单位:块', + axisLine: { + show: false + }, + splitNumber: 2, + axisTick: { + show: false + }, + axisLabel: { + textStyle: { + color: '#8FABBF', + fontSize: 14 + } + }, + splitLine: { + show: true, + lineStyle: { + type: [8, 4], + dashOffset: 4, + color: '#8FABBF' + } + } + }, + series: [ + { + name: '拆垛数', + type: 'bar', + barWidth: '8', + barGap: '200%', + itemStyle: { + normal: { + color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 1, + color: 'rgba(96,112,128,0.10)', + opacity: 1 + }, + { + offset: 0, + color: '#0E90FD', + opacity: 0.1 + } + ]) + } + }, + data: barData1 + }, + { + name: '码垛数', + type: 'bar', + barWidth: '8', + barGap: '200%', + itemStyle: { + normal: { + color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#33CCCC', + opacity: 1 + }, + { + offset: 1, + color: 'rgba(31,89,89,0.25)', + opacity: 0.25 + } + ]) + } + }, + data: barData2 + } + ] + } + let echart = document.getElementById('sortpack_echart_1') + if (this.myCharts1 !== '') { + this.myCharts1.dispose() + } + if (echart !== null) { + this.myCharts1 = this.$echarts.init(echart) + this.myCharts1.setOption(option) + window.addEventListener('resize', () => { + this.myCharts1.resize() + }) + } + }, + setEchart2 () { + let barName = [] + let barData1 = [] + let barData2 = [] + let barData3 = [] + this.CPDayList.map(el => { + barName.push(el.material_code) + barData1.push(el.inventory_qty) + barData2.push(el.qualified_in_qty) + barData3.push(el.unqualified_in_qty) + }) + let option = { + grid: { + top: 50, + left: 0, + right: 0, + bottom: 0, + containLabel: true + }, + legend: { + icon: 'rect', + textStyle: { + color: '#fff', + fontSize: 14, + lineHeight: 14 + }, + itemGap: 30.86, + itemWidth: 14.16, + itemHeight: 7.38, + data: [{name: '库存数', itemStyle: {color: '#0E90FD'}}, {name: '合格入库', itemStyle: {color: '#33CCCC'}}, {name: '不合格入库', itemStyle: {color: '#EAAD24'}}] + }, + xAxis: { + type: 'category', + axisTick: { + show: false + }, + axisLine: { + show: true, + lineStyle: { + width: 2, + color: '#8FABBF' + } + }, + axisLabel: { + interval: 0, + textStyle: { + color: '#8FABBF', + fontSize: 16 + } + // rotate: 50 + }, + data: barName + }, + yAxis: { + type: 'value', + name: '单位:块', + axisLine: { + show: false + }, + splitNumber: 2, + axisTick: { + show: false + }, + axisLabel: { + textStyle: { + color: '#8FABBF', + fontSize: 14 + } + }, + splitLine: { + show: true, + lineStyle: { + type: [8, 4], + dashOffset: 4, + color: '#8FABBF' + } + } + }, + series: [ + { + name: '库存数', + type: 'bar', + barWidth: '8', + barGap: '200%', + itemStyle: { + normal: { + color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 1, + color: 'rgba(96,112,128,0.10)', + opacity: 1 + }, + { + offset: 0, + color: '#0E90FD', + opacity: 0.1 + } + ]) + } + }, + data: barData1 + }, + { + name: '合格入库', + type: 'bar', + barWidth: '8', + barGap: '200%', + itemStyle: { + normal: { + color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#33CCCC', + opacity: 1 + }, + { + offset: 1, + color: 'rgba(31,89,89,0.25)', + opacity: 0.25 + } + ]) + } + }, + data: barData2 + }, + { + name: '不合格入库', + type: 'bar', + barWidth: '8', + barGap: '200%', + itemStyle: { + normal: { + color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#B68845', + opacity: 1 + }, + { + offset: 1, + color: 'rgba(134,98,45,0.25)', + opacity: 0.25 + } + ]) + } + }, + data: barData3 + } + ] + } + let echart = document.getElementById('sortpack_echart_2') + if (this.myCharts2 !== '') { + this.myCharts2.dispose() + } + if (echart !== null) { + this.myCharts2 = this.$echarts.init(echart) + this.myCharts2.setOption(option) + window.addEventListener('resize', () => { + this.myCharts2.resize() + }) } }, expandTooltip () { @@ -200,12 +503,12 @@ export default { this.$router.push('/hnlktwo') break case 3: + this.$router.push('/takeshapetwo') break case 4: this.$router.push('/firedrytwo') break case 5: - this.$router.push('/sortpacktwo') break case 6: this.$router.push('/pdtwo') @@ -254,6 +557,8 @@ export default { _wh(calc(50% - 8px), 100%) &:nth-child(2) margin-left 16px +.item_wrap_bg + background-image linear-gradient(to bottom, #070b1c, transparent) .item_tip _wh(100%, 32px) line-height 32px