diff --git a/src/assets/board/boardBg1.jpg b/src/assets/board/boardBg1.jpg
new file mode 100644
index 0000000..f1136fd
Binary files /dev/null and b/src/assets/board/boardBg1.jpg differ
diff --git a/src/assets/board/boardBg2.jpg b/src/assets/board/boardBg2.jpg
new file mode 100644
index 0000000..d2ae861
Binary files /dev/null and b/src/assets/board/boardBg2.jpg differ
diff --git a/src/assets/board/boardDevice.png b/src/assets/board/boardDevice.png
new file mode 100644
index 0000000..bb4eba3
Binary files /dev/null and b/src/assets/board/boardDevice.png differ
diff --git a/src/assets/board/boardDeviceStatus0.png b/src/assets/board/boardDeviceStatus0.png
new file mode 100644
index 0000000..35bd2ed
Binary files /dev/null and b/src/assets/board/boardDeviceStatus0.png differ
diff --git a/src/assets/board/boardDeviceStatus1.png b/src/assets/board/boardDeviceStatus1.png
new file mode 100644
index 0000000..8cd0398
Binary files /dev/null and b/src/assets/board/boardDeviceStatus1.png differ
diff --git a/src/assets/board/boardDeviceStatus2.png b/src/assets/board/boardDeviceStatus2.png
new file mode 100644
index 0000000..5c520d4
Binary files /dev/null and b/src/assets/board/boardDeviceStatus2.png differ
diff --git a/src/assets/board/boardDeviceStatus3.png b/src/assets/board/boardDeviceStatus3.png
new file mode 100644
index 0000000..611ff40
Binary files /dev/null and b/src/assets/board/boardDeviceStatus3.png differ
diff --git a/src/assets/board/boardItemBg.png b/src/assets/board/boardItemBg.png
new file mode 100644
index 0000000..2b50445
Binary files /dev/null and b/src/assets/board/boardItemBg.png differ
diff --git a/src/permission.js b/src/permission.js
index c9b39e4..3ace11e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register','/liner','/caseShell2','/foaming','/foaming2','/pourInto','/finalAssembly','/scanDown','/week','/model']
+const whiteList = ['/login', '/board1', '/board2', '/register', '/liner', '/caseShell2', '/foaming', '/foaming2', '/pourInto', '/finalAssembly', '/scanDown', '/week', '/model']
router.beforeEach((to, from, next) => {
NProgress.start()
diff --git a/src/router/index.js b/src/router/index.js
index fcc9fb3..81d3652 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -99,7 +99,17 @@ export const constantRoutes = [
title: "看板管理",
icon: "chart",
},
- children: [
+ children: [{
+ path: 'board1',
+ component: () => import('@/views/board/board1/index'),
+ name: 'Board1',
+ meta: {title: '车间监控', icon: '404',}
+ }, {
+ path: 'board2',
+ component: () => import('@/views/board/board2/index'),
+ name: 'Board2',
+ meta: {title: '效率监控', icon: '404',}
+ },
{
path: 'liner',
component: () => import('@/views/board/liner/index'),
diff --git a/src/views/board/board1/index.vue b/src/views/board/board1/index.vue
new file mode 100644
index 0000000..fe6aa01
--- /dev/null
+++ b/src/views/board/board1/index.vue
@@ -0,0 +1,337 @@
+
+
+
注塑车间设备运行监控平台
+
+ 设备数量
+ :
+ 16
+ 台
+
+
+ 开机率
+ :
+ 80
+ %
+
+
+ 运行
+ :
+ 11
+ 台
+
+
+ 停机
+ :
+ 02
+ 台
+
+
+ 待机
+ :
+ 01
+ 台
+
+
+ 待料
+ :
+ 01
+ 台
+
+
+ 未开机
+ :
+ 01
+ 台
+
+
+
+
AE-MD-S10
+
+
停机
+
待机
+
正常运行
+
待料
+
+ 6
+ min
+
+
+ 6
+ min
+
+
+ 6
+ min
+
+
+ 6
+ min
+
+
待机时长
+
+
+
+
+
+
+
diff --git a/src/views/board/board2/index.vue b/src/views/board/board2/index.vue
new file mode 100644
index 0000000..5407242
--- /dev/null
+++ b/src/views/board/board2/index.vue
@@ -0,0 +1,872 @@
+
+
+
注塑车间设备效率监控平台
+
+
+
+
+
设备信息
+
生产统计
+
稼动率/OEE
+
故障设备排名
+
+
+
+
+
+
+
+
+
+
01
+
焊接设备001
+
故障率:46% 故障次数:10
+
故障总时长:9min
+
+
+
02
+
焊接设备002
+
故障率:46% 故障次数:10
+
故障总时长:9min
+
+
+
03
+
焊接设备003
+
故障率:46% 故障次数:10
+
故障总时长:9min
+
+
+
+
+
+
diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue
index 6ab4f81..e84412f 100644
--- a/src/views/board/caseShell/index2.vue
+++ b/src/views/board/caseShell/index2.vue
@@ -184,7 +184,7 @@ export default {
containLabel: true,
},
legend: {
- data:['前板数量','后板数量'],
+ data: ['前板数量', '后板数量'],
right: 'center',
top: 0,
textStyle: {
@@ -196,7 +196,7 @@ export default {
},
xAxis: {
type: "category",
- data: e.map(val=>val.X_VALUE),
+ data: e.map(val => val.X_VALUE),
axisLine: {
lineStyle: {
color: "white",
@@ -234,10 +234,11 @@ export default {
normal: {
show: true,
position: "top",
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
textStyle: {
@@ -262,10 +263,10 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_ONE),
+ data: e.map(val => val.Y_VALUE_ONE),
},
{
- name:'后板数量',
+ name: '后板数量',
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
@@ -273,10 +274,11 @@ export default {
normal: {
show: true,
position: "top",
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
textStyle: {
@@ -301,7 +303,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_TWO),
+ data: e.map(val => val.Y_VALUE_TWO),
},
],
})
@@ -334,7 +336,7 @@ export default {
containLabel: true,
},
legend: {
- data: ['内胆','箱壳'],
+ data: ['内胆', '箱壳'],
right: 'center',
top: 0,
textStyle: {
@@ -346,7 +348,7 @@ export default {
},
xAxis: {
type: "category",
- data: e.map(val=>val.X_VALUE),
+ data: e.map(val => val.X_VALUE),
axisLine: {
lineStyle: {
color: "white",
@@ -383,10 +385,11 @@ export default {
label: {
normal: {
show: true,
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
position: "top",
@@ -412,7 +415,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_ONE),
+ data: e.map(val => val.Y_VALUE_ONE),
},
{
name: '箱壳',
@@ -422,10 +425,11 @@ export default {
label: {
normal: {
show: true,
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
position: "top",
@@ -451,7 +455,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_TWO),
+ data: e.map(val => val.Y_VALUE_TWO),
},
],
})
@@ -469,8 +473,8 @@ export default {
e: 'xkqhb-10',
i: "scada_xk_pro_xh_01('')",
f: (e) => {
- this.frontNum = e.map(val=>val.Y_VALUE_ONE).reduce((a,b)=>a+b)
- this.laterNum = e.map(val=>val.Y_VALUE_TWO).reduce((a,b)=>a+b)
+ this.frontNum = e.map(val => val.Y_VALUE_ONE).reduce((a, b) => a + b)
+ this.laterNum = e.map(val => val.Y_VALUE_TWO).reduce((a, b) => a + b)
this.$refs.chart3.setData({
tooltip: {
trigger: "axis",
@@ -487,7 +491,7 @@ export default {
containLabel: true,
},
legend: {
- data: ['前板','后板'],
+ data: ['前板', '后板'],
right: 'center',
top: 0,
textStyle: {
@@ -499,7 +503,7 @@ export default {
},
xAxis: {
type: "category",
- data: e.map(val=>val.X_VALUE),
+ data: e.map(val => val.X_VALUE),
axisLine: {
lineStyle: {
color: "white",
@@ -536,10 +540,11 @@ export default {
label: {
normal: {
show: true,
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
position: "top",
@@ -565,7 +570,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_ONE),
+ data: e.map(val => val.Y_VALUE_ONE),
},
{
name: '后板',
@@ -575,10 +580,11 @@ export default {
label: {
normal: {
show: true,
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
position: "top",
@@ -604,7 +610,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE_TWO),
+ data: e.map(val => val.Y_VALUE_TWO),
},
],
})
@@ -642,7 +648,7 @@ export default {
},
xAxis: {
type: "category",
- data: e.map(val=>val.X_VALUE),
+ data: e.map(val => val.X_VALUE),
axisLine: {
lineStyle: {
color: "white",
@@ -680,10 +686,11 @@ export default {
normal: {
show: true,
position: "top",
- formatter:(e)=>{
- if(e.data === 0){
+ formatter: (e) => {
+ if (e.data === 0) {
return ''
- }else{}
+ } else {
+ }
return e.data
},
textStyle: {
@@ -708,7 +715,7 @@ export default {
]),
},
},
- data: e.map(val=>val.Y_VALUE),
+ data: e.map(val => val.Y_VALUE),
}
]
})
@@ -730,7 +737,7 @@ export default {
},
methods: {},
beforeDestroy() {
- if(intervalFun){
+ if (intervalFun) {
clearInterval(intervalFun)
intervalFun = null
}