diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml index edb765e..03e58ba 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/consumptionReport/service/dao/mapper/ConsumeReportMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/wms/nladmin-ui/src/assets/images/logo.png b/wms/nladmin-ui/src/assets/images/logo.png index a1ca19b..f757710 100644 Binary files a/wms/nladmin-ui/src/assets/images/logo.png and b/wms/nladmin-ui/src/assets/images/logo.png differ diff --git a/wms/nladmin-ui/src/assets/images/logo1.png b/wms/nladmin-ui/src/assets/images/logo1.png deleted file mode 100644 index f757710..0000000 Binary files a/wms/nladmin-ui/src/assets/images/logo1.png and /dev/null differ diff --git a/wms/nladmin-ui/src/router/routers.js b/wms/nladmin-ui/src/router/routers.js index 345a678..3d8f56d 100644 --- a/wms/nladmin-ui/src/router/routers.js +++ b/wms/nladmin-ui/src/router/routers.js @@ -17,6 +17,12 @@ export const constantRouterMap = [ component: (resolve) => require(['@/views/features/404'], resolve), hidden: true }, + { + path: '/screen/fullscreen', + meta: { title: '智慧看板', noCache: true }, + component: (resolve) => require(['@/views/wms/biBoard/screen/index'], resolve), + hidden: true + }, { path: '/401', component: (resolve) => require(['@/views/features/401'], resolve), diff --git a/wms/nladmin-ui/src/views/wms/biBoard/screen/index.vue b/wms/nladmin-ui/src/views/wms/biBoard/screen/index.vue index 1728477..a76518d 100644 --- a/wms/nladmin-ui/src/views/wms/biBoard/screen/index.vue +++ b/wms/nladmin-ui/src/views/wms/biBoard/screen/index.vue @@ -36,12 +36,12 @@
焊材库存占比
-
+
焊材领料Top5
-
+
@@ -76,7 +76,7 @@
温湿度监控
-
+
@@ -109,7 +109,7 @@
班组焊材消耗
-
+
当日领退明细
@@ -162,32 +162,6 @@ export default { scrollIndex3: 0 } }, - mounted() { - this.updateTime() - this.timer = setInterval(this.updateTime, 1000) - - this.loadAllData() - this.dataTimer = setInterval(this.loadAllData, 30000) // 30秒刷新一次 - - this.startScrolling() - }, - beforeDestroy() { - if (this.timer) { - clearInterval(this.timer) - } - if (this.dataTimer) { - clearInterval(this.dataTimer) - } - if (this.scrollTimer1) { - clearInterval(this.scrollTimer1) - } - if (this.scrollTimer2) { - clearInterval(this.scrollTimer2) - } - if (this.scrollTimer3) { - clearInterval(this.scrollTimer3) - } - }, computed: { displayIosReportData() { if (this.iosReportData.length <= 5) { @@ -223,6 +197,32 @@ export default { return result } }, + mounted() { + this.updateTime() + this.timer = setInterval(this.updateTime, 1000) + + this.loadAllData() + this.dataTimer = setInterval(this.loadAllData, 30000) // 30秒刷新一次 + + this.startScrolling() + }, + beforeDestroy() { + if (this.timer) { + clearInterval(this.timer) + } + if (this.dataTimer) { + clearInterval(this.dataTimer) + } + if (this.scrollTimer1) { + clearInterval(this.scrollTimer1) + } + if (this.scrollTimer2) { + clearInterval(this.scrollTimer2) + } + if (this.scrollTimer3) { + clearInterval(this.scrollTimer3) + } + }, methods: { updateTime() { const now = new Date() @@ -394,16 +394,16 @@ export default { radius: ['40%', '70%'], center: ['40%', '50%'], data: [ - { value: data.hasGoods || 0, name: '有货', itemStyle: { color: '#5470c6' } }, - { value: data.emptyBox || 0, name: '空料箱', itemStyle: { color: '#91cc75' } }, - { value: data.noGoods || 0, name: '无货', itemStyle: { color: '#fac858' } } + { value: data.hasGoods || 0, name: '有货', itemStyle: { color: '#5470c6' }}, + { value: data.emptyBox || 0, name: '空料箱', itemStyle: { color: '#91cc75' }}, + { value: data.noGoods || 0, name: '无货', itemStyle: { color: '#fac858' }} ], label: { color: '#fff' } } ] - }; + } chart.setOption(option) }, @@ -428,14 +428,14 @@ export default { xAxis: { type: 'category', data: times, - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff' } }, yAxis: { type: 'value', - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff' }, - splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' } } + splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' }} }, series: [ { @@ -477,14 +477,14 @@ export default { xAxis: { type: 'category', data: groups, - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff', rotate: 30 } }, yAxis: { type: 'value', - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff' }, - splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' } } + splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' }} }, series: [ { @@ -524,14 +524,14 @@ export default { }, xAxis: { type: 'value', - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff' }, - splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' } } + splitLine: { lineStyle: { color: 'rgba(255,255,255,0.1)' }} }, yAxis: { type: 'category', data: materials, - axisLine: { lineStyle: { color: '#fff' } }, + axisLine: { lineStyle: { color: '#fff' }}, axisLabel: { color: '#fff' } }, series: [ @@ -642,7 +642,7 @@ export default { } .center-left { - flex: 0 0 50%; + flex: 0 0 100%; display: flex; flex-direction: column; gap: 20px; @@ -747,7 +747,7 @@ export default { .agv-icon { flex: 0 0 40px; - + .agv-img { width: 40px; height: 25px;