diff --git a/README.md b/README.md
index aa6f202..224b019 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,5 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
# 注意事项
+ 华弘大屏分辨率都为 1920 * 1200
+ 看板分辨率为 1920 * 1080
-+ 接口文档地址:https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc
\ No newline at end of file
++ 接口文档地址:https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc
++ https://apifox.com/apidoc/shared-7fca569c-0233-402a-92da-74188764d4fc/api-168547155
\ No newline at end of file
diff --git a/src/config/getData2.js b/src/config/getData2.js
index a1db901..a60290c 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -7,3 +7,5 @@ export const inOutKilnDetail = () => post('api/cockpit/inOutKilnDetail', {})
export const kilnDetail = () => post('api/cockpit/kilnDetail', {})
// 大屏-两侧图表
export const screenTableData = () => post('api/cockpit/screenTableData', {})
+// 窑看板
+export const klineInfo = () => post('api/cockpit/klineInfo', {})
diff --git a/src/config/mork2.js b/src/config/mork2.js
index 3ab73c9..88d71ce 100644
--- a/src/config/mork2.js
+++ b/src/config/mork2.js
@@ -2142,3 +2142,394 @@ export const screenTableData = () => {
}
return res
}
+// 窑看板
+export const klineInfo = () => {
+ let res = {
+ 'outKilnInfoVos': [
+ {
+ 'vehicleCode': '1026',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1008',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0022',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1063',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0019',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1035',
+ 'materialCode': 'AP-55A',
+ 'materialModel': '35/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '1062',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1023',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1027',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0008',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0045',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1055',
+ 'materialCode': 'MT-14A',
+ 'materialModel': '20/40',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1147',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0039',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1001',
+ 'materialCode': 'MT-14BT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1064',
+ 'materialCode': 'ML-70B',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1028',
+ 'materialCode': 'ML-60BT',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1029',
+ 'materialCode': 'ML-14BT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1044',
+ 'materialCode': 'ML-70B',
+ 'materialModel': '20/30',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1013',
+ 'materialCode': 'ML-60BT',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1135',
+ 'materialCode': 'ML-60BT',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ }
+ ],
+ 'inKilnInfoVos': [
+ {
+ 'vehicleCode': '0009',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0048',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0024',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1046',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1145',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0016',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1085',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1801',
+ 'materialCode': 'BP-65A',
+ 'materialModel': '35/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '0036',
+ 'materialCode': 'MT-14A',
+ 'materialModel': '18/40',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '0018',
+ 'materialCode': 'MT-14A',
+ 'materialModel': '18/40',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1098',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0010',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1139',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ }
+ ],
+ 'twoKilnInfoVos': [],
+ 'oneKilnInfoVos': [
+ {
+ 'vehicleCode': '0003',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1094',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0034',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1003',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1144',
+ 'materialCode': 'BP-70A',
+ 'materialModel': '40/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '1022',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1032',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0026',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1066',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1069',
+ 'materialCode': 'BP-65A',
+ 'materialModel': '35/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '1014',
+ 'materialCode': 'BP-70A',
+ 'materialModel': '40/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '1072',
+ 'materialCode': 'MT-60AT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1057',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0049',
+ 'materialCode': 'BP-65A',
+ 'materialModel': '35/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '0032',
+ 'materialCode': 'BP-70A',
+ 'materialModel': '40/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '0027',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1065',
+ 'materialCode': 'ML-70B',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '0038',
+ 'materialCode': 'MT-14A',
+ 'materialModel': '18/40',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '0006',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1038',
+ 'materialCode': 'MT-14BT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '0013',
+ 'materialCode': 'ML-60BT',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1042',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1138',
+ 'materialCode': 'AP-70A',
+ 'materialModel': '40/0',
+ 'materialSpec': 'BD'
+ },
+ {
+ 'vehicleCode': '1056',
+ 'materialCode': 'ML-70BD',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1071',
+ 'materialCode': 'ML-75B',
+ 'materialModel': '18/30',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '0040',
+ 'materialCode': 'MT-14BT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1078',
+ 'materialCode': 'MT-14BT',
+ 'materialModel': '20/30',
+ 'materialSpec': 'ZX'
+ },
+ {
+ 'vehicleCode': '1041',
+ 'materialCode': 'MT-14A',
+ 'materialModel': '20/40',
+ 'materialSpec': 'BB'
+ },
+ {
+ 'vehicleCode': '1080',
+ 'materialCode': 'ML-60BT',
+ 'materialModel': '20/10',
+ 'materialSpec': 'BB'
+ }
+ ]
+ }
+ return res
+}
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index daa43f0..8f703fd 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -68,7 +68,7 @@ export default {
return {
loginname: '',
password: '',
- options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}],
+ options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}, {value: '4', label: '干燥作业监控'}],
value: this.$store.getters.equipId,
baseUrl: this.$store.getters.baseUrl,
setTime: this.$store.getters.setTime / 1000,
@@ -101,6 +101,8 @@ export default {
this.$router.push('/boardindex/pressprod')
} else if (this.value === '3') {
this.$router.push('/boardindex/sortwork')
+ } else if (this.value === '4') {
+ this.$router.push('/boardindex/drytask')
}
let element = document.documentElement
if (this.fullscreen) {
diff --git a/src/pages/modules/board/DryTask.vue b/src/pages/modules/board/DryTask.vue
index 4fb6a0a..8c50f47 100644
--- a/src/pages/modules/board/DryTask.vue
+++ b/src/pages/modules/board/DryTask.vue
@@ -1,6 +1,211 @@
-
+
+
+
+
冷却输送线
+
+
+
{{ e.vehicleCode }}
+
+
{{e.materialCode}}
+
{{ e.materialModel }}
+
{{ e.materialSpec }}
+
+
+
+
+
+
+
1号窑
+
+
+
{{ e.vehicleCode }}
+
+
{{e.materialCode}}
+
{{ e.materialModel }}
+
{{ e.materialSpec }}
+
+
+
+
+
+
+
2号窑
+
+
+
{{ e.vehicleCode }}
+
+
{{e.materialCode}}
+
{{ e.materialModel }}
+
{{ e.materialSpec }}
+
+
+
+
+
+
+
进窑输送线
+
+
+
{{ e.vehicleCode }}
+
+
{{e.materialCode}}
+
{{ e.materialModel }}
+
{{ e.materialSpec }}
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index c5a37d3..a896ce5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ const home = r => require.ensure([], () => r(require('@page/modules/home/index')
const boardIndex = r => require.ensure([], () => r(require('@page/modules/board/index')), 'boardIndex')
const PressProd = r => require.ensure([], () => r(require('@page/modules/board/PressProd')), 'PressProd')
const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/board/SortWorkMonitor')), 'SortWorkMonitor')
+const DryTask = r => require.ensure([], () => r(require('@page/modules/board/DryTask')), 'DryTask')
Vue.use(Router)
@@ -35,6 +36,10 @@ export default new Router({
path: 'sortwork',
component: SortWorkMonitor,
meta: {title: '分拣作业监控'}
+ }, {
+ path: 'drytask',
+ component: DryTask,
+ meta: {title: '干燥作业监控'}
}]
}
]