From 365708d101c0f22e9dd205f6896748738a389f16 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 29 Aug 2024 09:17:22 +0800 Subject: [PATCH] =?UTF-8?q?960=E7=9A=84=E5=88=86=E8=BE=A8=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 3 +- src/config/mork2.js | 2 +- src/pages/Setup.vue | 75 ++--- src/pages/modules/home/index.vue | 64 ++-- src/pages/modules/home/left.vue | 337 +++++-------------- src/pages/modules/home/right.vue | 168 ++++------ src/pages/modules/home_back/index.vue | 105 ++++++ src/pages/modules/home_back/left.vue | 454 ++++++++++++++++++++++++++ src/pages/modules/home_back/right.vue | 443 +++++++++++++++++++++++++ src/router/index.js | 7 +- src/style/iconfont.styl | 32 +- src/vuex/modules/com.js | 6 +- 12 files changed, 1235 insertions(+), 461 deletions(-) create mode 100644 src/pages/modules/home_back/index.vue create mode 100644 src/pages/modules/home_back/left.vue create mode 100644 src/pages/modules/home_back/right.vue diff --git a/index.html b/index.html index d0f1a43..4779d0c 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,8 @@ - + + 天能涂板暂存库可视化看板 diff --git a/src/config/mork2.js b/src/config/mork2.js index f6175fa..3ef0a09 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -812,7 +812,7 @@ export const boardPoint = () => { 'point_status': '1' }, { - 'material_name': '', + 'material_name': '20中负', 'point_code': '19-01-01', 'point_status': '1' }, diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index a4e5416..92bca46 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -67,31 +67,31 @@ export default { equipId: this.index } this.$store.dispatch('setConfig', obj) + let element = document.documentElement + if (this.fullscreen) { + if (document.exitFullscreen) { + document.exitFullscreen() + } else if (document.webkitCancelFullScreen) { + document.webkitCancelFullScreen() + } else if (document.mozCancelFullScreen) { + document.mozCancelFullScreen() + } else if (document.msExitFullscreen) { + document.msExitFullscreen() + } + } else { + if (element.requestFullscreen) { + element.requestFullscreen() + } else if (element.webkitRequestFullScreen) { + element.webkitRequestFullScreen() + } else if (element.mozRequestFullScreen) { + element.mozRequestFullScreen() + } else if (element.msRequestFullscreen) { + // IE11 + element.msRequestFullscreen() + } + } + this.fullscreen = !this.fullscreen this.$router.push('/index') - // let element = document.documentElement - // if (this.fullscreen) { - // if (document.exitFullscreen) { - // document.exitFullscreen() - // } else if (document.webkitCancelFullScreen) { - // document.webkitCancelFullScreen() - // } else if (document.mozCancelFullScreen) { - // document.mozCancelFullScreen() - // } else if (document.msExitFullscreen) { - // document.msExitFullscreen() - // } - // } else { - // if (element.requestFullscreen) { - // element.requestFullscreen() - // } else if (element.webkitRequestFullScreen) { - // element.webkitRequestFullScreen() - // } else if (element.mozRequestFullScreen) { - // element.mozRequestFullScreen() - // } else if (element.msRequestFullscreen) { - // // IE11 - // element.msRequestFullscreen() - // } - // } - // this.fullscreen = !this.fullscreen } } } @@ -101,7 +101,7 @@ export default { @import '~@style/mixin' .container _wh(100%, 100%) - background center / 100% 100% url('../images/bg.jpg') no-repeat + // background center / 100% 100% url('../images/bg.jpg') no-repeat p _font(12px, 12px ,#fff,,) .content @@ -109,15 +109,14 @@ export default { z-index 1 top 50% left 50% - width 25% - min-width 890px + width 50% transform translateX(-50%) translateY(-50%) h1 - font-size .3rem + font-size 30px font-family: 'YouSheBiaoTiHei'; font-weight: 400; color: transparent; - line-height .3rem + line-height 30px opacity: 0.89; background: linear-gradient(0deg, #AAD0F6 0%, #D7E7F5 53.3154296875%, #E0EAF6 100%); filter: drop-shadow(#092F6D 1px 4px 1px); @@ -127,10 +126,12 @@ h1 margin-bottom 5% .login_wrap width 100% - background #103170 center / 100% 100% url('../images/bg-m_2.png') no-repeat + background-color #08225f + border 1px solid #43b3fa + // background #103170 center / 100% 100% url('../images/bg-m_2.png') no-repeat padding 3% 10% 6% 10% h2 - _font(.15rem, .15rem, #9BB9DD,700,center) + _font(15px, 15px, #9BB9DD,700,center) margin-bottom 4% .item_wrap background linear-gradient(to bottom, #081438, #0c205a) @@ -138,19 +139,19 @@ h2 padding 2% 2% margin-bottom 3% .label - _font(.12rem, .25rem, #fff,,left) + _font(12px, 25px, #fff,,left) .input width 100% - _font(.12rem, .25rem, #fff,,left) + _font(12px, 25px, #fff,,left) background-color transparent .btn background-color #2778f3 border-radius 6px - height .4rem - font-size .17rem + height 40px + font-size 17px color #fff - letter-spacing .05rem - line-height .4rem + letter-spacing 5px + line-height 40px outline none border none diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index 693efd3..33ed89e 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -2,12 +2,12 @@

天能涂板暂存库可视化看板

- +
-
-
+
+
@@ -16,17 +16,26 @@ + + diff --git a/src/pages/modules/home_back/left.vue b/src/pages/modules/home_back/left.vue new file mode 100644 index 0000000..14ab676 --- /dev/null +++ b/src/pages/modules/home_back/left.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/pages/modules/home_back/right.vue b/src/pages/modules/home_back/right.vue new file mode 100644 index 0000000..5228fe9 --- /dev/null +++ b/src/pages/modules/home_back/right.vue @@ -0,0 +1,443 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 23a8d62..aa74569 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,9 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') -const Index = r => require.ensure([], () => r(require('@page/modules/home/index')), 'screen') - Vue.use(Router) export default new Router({ @@ -15,11 +12,11 @@ export default new Router({ }, { path: '/setup', - component: Setup + component: (resolve) => require(['@page/Setup'], resolve) }, { path: '/index', - component: Index + component: (resolve) => require(['@page/modules/home/index'], resolve) } ] }) diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index 60a459d..895506d 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -4,22 +4,22 @@ url('iconfont/iconfont.woff') format('woff'), url('iconfont/iconfont.ttf') format('truetype'); } -@font-face { - font-family: "YouSheBiaoTiHei"; - src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Bold"; - src: url('font/SourceHanSansCN-Bold.otf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Regular"; - src: url('font/SourceHanSansCN-Regular.otf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Medium"; - src: url('font/SourceHanSansCN-Medium.otf') format('truetype'); -} +// @font-face { +// font-family: "YouSheBiaoTiHei"; +// src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Bold"; +// src: url('font/SourceHanSansCN-Bold.otf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Regular"; +// src: url('font/SourceHanSansCN-Regular.otf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Medium"; +// src: url('font/SourceHanSansCN-Medium.otf') format('truetype'); +// } .iconfont { font-family: "iconfont" !important; font-size: 16px; diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index 540c6df..c6015d9 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -1,14 +1,16 @@ import * as types from '../types' import { getStore, setStore } from '@js/mUtils.js' -const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.59:8080' : 'http://192.168.46.5:8080/hl_nlapp' +const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.44.101.112:8010' : 'http://10.44.101.112:8010' /** * App通用配置 */ const state = { baseUrl: getStore('baseUrl') || baseUrl, - setTime: getStore('setTime') || 5000, + // baseUrl: baseUrl, + setTime: getStore('setTime') || 30000, + // setTime: 30000, equipId: getStore('equipId') || '1' }