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/components/header.vue b/src/components/header.vue index 011e3e3..5028fdc 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -1,20 +1,19 @@ @@ -22,54 +21,102 @@ export default { name: 'Header', data () { - return {} + return { + expand: false, + timer: null, + time: '', + hours: '', + minutes: '', + seconds: '', + date: '', + week: '' + } }, props: { - index: String + title: String + }, + created () { + this.updateTime() + this.timer = window.setInterval(this.updateTime, 1000) + }, + beforeDestroy () { + this.$once('hook:beforeDestroy', () => { + clearInterval(this.timer) + }) + }, + methods: { + expandTooltip () { + this.expand = !this.expand + }, + updateTime () { + let cd = new Date() + let year = cd.getFullYear() + let month = cd.getMonth() + 1 < 10 ? '0' + (cd.getMonth() + 1) : cd.getMonth() + 1 + let date = cd.getDate() < 10 ? '0' + cd.getDate() : cd.getDate() + let hh = cd.getHours() < 10 ? '0' + cd.getHours() : cd.getHours() + let mm = cd.getMinutes() < 10 ? '0' + cd.getMinutes() : cd.getMinutes() + let ss = cd.getSeconds() < 10 ? '0' + cd.getSeconds() : cd.getSeconds() + var weekday = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'] + let myddy = new Date().getDay() + let week = weekday[myddy] + this.time = `${hh}:${mm}:${ss}` + this.hours = `${hh}` + this.minutes = `${mm}` + this.seconds = `${ss}` + this.date = `${year}年${month}月${date}日` + this.week = `${week}` + } } } diff --git a/src/components/header3.vue b/src/components/header3.vue deleted file mode 100644 index 5b63d58..0000000 --- a/src/components/header3.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - 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/css/mixin.styl b/src/css/mixin.styl deleted file mode 100644 index 97224f1..0000000 --- a/src/css/mixin.styl +++ /dev/null @@ -1,49 +0,0 @@ -$red = #ed4754 -$green = #67c23a -$yellow = #f2d648 -$orange = #f17d3a -$blue = #6798ef -$gray = #c9c9c9 -$fc1 = #323232 - -.green - background-color #11ff0d -.yellow - background-color #fdfd0f -.gray - background-color #bfbfbf -.red - background-color #ff1016 - -//宽高 -_wh(w, h) - width: w - height: h - -//字体大小、行高、颜色 -_font(size,height,color=$fc1,weight=normal,align=left) - font-size: size - line-height: height - color: color - font-weight: weight - text-align: align - -//flex 布局和 子元素 对其方式 -_fj(x=space-between,y=center) - display: flex - justify-content: x - align-items: y - -// 背景图片地址和大小 -_bis(url,w,h=auto,x=center,y=center) - background-position: x y - background-size: w h - background-image: url(url) - background-repeat: no-repeat - -// 定位上下居中 -_ct() - position: absolute - top: 50% - transform: translateY(-50%) - \ No newline at end of file diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index f0c5b0d..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: '看板1'}, {value: '3', label: '看板2'}], + 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, @@ -98,9 +98,11 @@ export default { if (this.value === '1') { this.$router.push('/home') } else if (this.value === '2') { - this.$router.push('/pressprod') + this.$router.push('/boardindex/pressprod') } else if (this.value === '3') { - this.$router.push('/SortWorkMonitor') + 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 new file mode 100644 index 0000000..8c50f47 --- /dev/null +++ b/src/pages/modules/board/DryTask.vue @@ -0,0 +1,211 @@ + + + + diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/board/PressProd.vue similarity index 79% rename from src/pages/modules/PressProd.vue rename to src/pages/modules/board/PressProd.vue index cdcc78f..54a9df1 100644 --- a/src/pages/modules/PressProd.vue +++ b/src/pages/modules/board/PressProd.vue @@ -1,113 +1,103 @@ diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index 98ddf32..c244d78 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -8,10 +8,7 @@

宁德华弘新材料科技有限公司

-
-
退出
-
-
+
@@ -1423,29 +1420,4 @@ export default { .state_name width 100% height 20px -.exit_btn - position: absolute; - left: 0; - top: 30px; - height 50px; - display: flex; - justify-content: space-between; -.exit_txt - font-size: 20px; - line-height: 50px; - color: #e6e7e1; - text-align: center; - font-weight: bold; - transition width .3s ease - overflow hidden - background-color: rgba(30, 182, 203, 80%); -.exit_arrow - width: 46px; - font-size: 20px; - line-height: 50px; - color: #e6e7e1; - text-align: center; - background-color: rgba(30, 182, 203, 60%); - border-top-right-radius: 30px; - border-bottom-right-radius: 30px diff --git a/src/router/index.js b/src/router/index.js index 2c5898a..a896ce5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,8 +3,10 @@ import Router from 'vue-router' const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') const home = r => require.ensure([], () => r(require('@page/modules/home/index')), 'home') -const PressProd = r => require.ensure([], () => r(require('@page/modules/PressProd')), 'PressProd') -const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/SortWorkMonitor')), 'SortWorkMonitor') +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) @@ -24,12 +26,21 @@ export default new Router({ component: home }, { - path: '/pressprod', - component: PressProd - }, - { - path: '/SortWorkMonitor', - component: SortWorkMonitor + path: '/boardindex', + component: boardIndex, + children: [{ + path: 'pressprod', + component: PressProd, + meta: {title: '压制生产看板'} + }, { + path: 'sortwork', + component: SortWorkMonitor, + meta: {title: '分拣作业监控'} + }, { + path: 'drytask', + component: DryTask, + meta: {title: '干燥作业监控'} + }] } ] }) diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index 60a459d..e9d5e14 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -1,5 +1,5 @@ @font-face { - font-family: "iconfont"; /* Project id 1255596 */ + font-family: "iconfont"; src: url('iconfont/iconfont.woff2') format('woff2'), url('iconfont/iconfont.woff') format('woff'), url('iconfont/iconfont.ttf') format('truetype'); @@ -30,4 +30,4 @@ .icon-guanbi:before { content: "\e60f"; -} +} \ No newline at end of file diff --git a/src/style/iconfont/iconfont.json b/src/style/iconfont/iconfont.json deleted file mode 100644 index 34ac18f..0000000 --- a/src/style/iconfont/iconfont.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "id": "1255596", - "name": "nl-hht-hl", - "font_family": "iconfont", - "css_prefix_text": "icon-", - "description": "", - "glyphs": [ - { - "icon_id": "2229060", - "name": "无信号", - "font_class": "no-signal", - "unicode": "e76b", - "unicode_decimal": 59243 - }, - { - "icon_id": "400034", - "name": "下拉", - "font_class": "htmal5icon03", - "unicode": "e626", - "unicode_decimal": 58918 - }, - { - "icon_id": "731140", - "name": "选择", - "font_class": "guanbi1", - "unicode": "e608", - "unicode_decimal": 58888 - }, - { - "icon_id": "4736203", - "name": "关闭", - "font_class": "guanbi", - "unicode": "e60f", - "unicode_decimal": 58895 - } - ] -} diff --git a/src/style/iconfont/iconfont.ttf b/src/style/iconfont/iconfont.ttf index d19ae0d..239c64c 100644 Binary files a/src/style/iconfont/iconfont.ttf and b/src/style/iconfont/iconfont.ttf differ diff --git a/src/style/iconfont/iconfont.woff b/src/style/iconfont/iconfont.woff index 31debf3..82a494e 100644 Binary files a/src/style/iconfont/iconfont.woff and b/src/style/iconfont/iconfont.woff differ diff --git a/src/style/iconfont/iconfont.woff2 b/src/style/iconfont/iconfont.woff2 index f9b361d..5929552 100644 Binary files a/src/style/iconfont/iconfont.woff2 and b/src/style/iconfont/iconfont.woff2 differ diff --git a/src/style/layout.styl b/src/style/layout.styl index 285076a..c051f9f 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -8,4 +8,17 @@ .state_2 background center / 100% 100% url('../images/state_2.png') no-repeat .state_3 - background center / 100% 100% url('../images/state_3.png') no-repeat \ No newline at end of file + background center / 100% 100% url('../images/state_3.png') no-repeat +.exit_btn + position: fixed; + left: 16px; + top: 74px; + width: 40px; + height 40px; + line-height 40px; + border-radius: 50%; + background-color: rgba(0,0,0,0.1); + font-size: 22px; + color: rgba(103,100,100,0.1); + text-align: center; + cursor: pointer; \ No newline at end of file