diff --git a/src/assets/img/choicepart/basicData.png b/src/assets/img/choicepart/basicData.png index c2b0567..38af565 100644 Binary files a/src/assets/img/choicepart/basicData.png and b/src/assets/img/choicepart/basicData.png differ diff --git a/src/assets/img/choicepart/choicepart-back-u.png b/src/assets/img/choicepart/choicepart-back-u.png new file mode 100644 index 0000000..36b77c5 Binary files /dev/null and b/src/assets/img/choicepart/choicepart-back-u.png differ diff --git a/src/assets/img/choicepart/choicepart-back.png b/src/assets/img/choicepart/choicepart-back.png index b16893b..6ed3cae 100644 Binary files a/src/assets/img/choicepart/choicepart-back.png and b/src/assets/img/choicepart/choicepart-back.png differ diff --git a/src/assets/img/choicepart/inStore.png b/src/assets/img/choicepart/inStore.png index aa21ce8..cebe05d 100644 Binary files a/src/assets/img/choicepart/inStore.png and b/src/assets/img/choicepart/inStore.png differ diff --git a/src/assets/img/choicepart/inventoryManagement.png b/src/assets/img/choicepart/inventoryManagement.png index be9fd7d..df9e45a 100644 Binary files a/src/assets/img/choicepart/inventoryManagement.png and b/src/assets/img/choicepart/inventoryManagement.png differ diff --git a/src/assets/img/choicepart/outStore.png b/src/assets/img/choicepart/outStore.png index b566217..5e3cdbc 100644 Binary files a/src/assets/img/choicepart/outStore.png and b/src/assets/img/choicepart/outStore.png differ diff --git a/src/assets/img/choicepart/statisticalReports.png b/src/assets/img/choicepart/statisticalReports.png index aba3104..d9a7e2c 100644 Binary files a/src/assets/img/choicepart/statisticalReports.png and b/src/assets/img/choicepart/statisticalReports.png differ diff --git a/src/assets/img/choicepart/systemSettings.png b/src/assets/img/choicepart/systemSettings.png index 602a805..f6c76ee 100644 Binary files a/src/assets/img/choicepart/systemSettings.png and b/src/assets/img/choicepart/systemSettings.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index affc790..ec93512 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -11,10 +11,12 @@
-
+ +
+
@@ -204,8 +206,12 @@ export default { clearInterval(logoutInterval) }, async toHome() { - this.$store.dispatch('app/setChoicepart') - this.$router.push('/') + // this.$store.dispatch('app/setChoicepart') + // this.$router.push('/') + if (localStorage.getItem('param')) { + const param = JSON.parse(window.atob(localStorage.getItem('param'))) + window.location = 'https://www.baidu.com/?' + param + } }, handleAlarm() {}, getAlarm() { diff --git a/src/views/wmsHome/index.vue b/src/views/wmsHome/index.vue index 31d3c12..300e113 100644 --- a/src/views/wmsHome/index.vue +++ b/src/views/wmsHome/index.vue @@ -1,21 +1,25 @@ @@ -28,11 +32,25 @@ export default { components: { Navbar }, data() { return { + beilv: 1, moduleList: [] } }, mounted() { + this.beilv = document.getElementById('container').offsetWidth / 1920 + window.addEventListener('resize', () => { + if (this.isFullScreen) { + this.beilv = document.body.offsetWidth / 1920 + } else { + this.beilv = document.getElementById('container').offsetWidth / 1920 + } + }) this.getModuleList() + const path = location.href + if (path.indexOf('?') !== -1) { + const param = path.split('?') + localStorage.setItem('param', window.btoa(JSON.stringify(param[1]))) + } }, methods: { getModuleList() { @@ -70,41 +88,38 @@ export default { .choicepart-container { min-width: 100%; min-height: 100vh; - // background: linear-gradient(-45deg, rgb(25, 25, 200), rgb(0, 100, 200)); background: url('../../assets/img/choicepart/choicepart-back.png') repeat; background-size: cover; overflow-x: auto; .choicepart-box { - width: 1585px; + // width: 1585px; margin: 0 auto; padding-top: 25vh; .choicepart-item { display: inline-block; - width: 180px; - height: 223px; - margin: 40px; + // width: 180px; + // height: 223px; + // margin: 40px; background: url('../../assets/img/choicepart/choice-item-back.png') no-repeat; background-size: 100% 100%; - // border: 1px dashed #fff; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5); top: 0; border-radius: 5px; overflow: hidden; cursor: pointer; position: relative; img { - width: 90px; - height: 99px; + // width: 90px; + // height: 90px; position: absolute; - top: 32px; - left: 43px; + // top: 32px; + // left: 43px; } .choicepart-item-border { height: 100%; border-radius: 5px; padding: 0 5px; - line-height: 32px; - font-size: 28px; + // line-height: 32px; + // font-size: 28px; font-weight: lighter; color: #2c6bd8; overflow: hidden; @@ -120,9 +135,9 @@ export default { right: 2px; text-align: center; color: #fff; - font-size: 16px; - line-height: 40px; - height: 40px; + // font-size: 16px; + // line-height: 40px; + // height: 40px; letter-spacing: 2px; background-color: rgba($color: #0b58ff, $alpha: 0.45); } @@ -140,6 +155,13 @@ export default { right: 0; z-index: 10; } + .bottom-img { + img { + width: 100%; + position: fixed; + bottom: 0; + } + } } ::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色,还可以设置边框属性