diff --git a/src/assets/image/vxEwm/bg1.png b/src/assets/image/vxEwm/bg1.png new file mode 100644 index 0000000..c550f3d Binary files /dev/null and b/src/assets/image/vxEwm/bg1.png differ diff --git a/src/assets/image/vxEwm/bg2.png b/src/assets/image/vxEwm/bg2.png new file mode 100644 index 0000000..22a1974 Binary files /dev/null and b/src/assets/image/vxEwm/bg2.png differ diff --git a/src/views/vxEwm/enterprise/components/firmInfo.vue b/src/views/vxEwm/enterprise/components/firmInfo.vue index 0d1c9f0..830f3c7 100644 --- a/src/views/vxEwm/enterprise/components/firmInfo.vue +++ b/src/views/vxEwm/enterprise/components/firmInfo.vue @@ -1,65 +1,73 @@ diff --git a/src/views/vxEwm/enterprise/index copy.vue b/src/views/vxEwm/enterprise/index copy.vue deleted file mode 100644 index edf6d8c..0000000 --- a/src/views/vxEwm/enterprise/index copy.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - - diff --git a/src/views/vxEwm/enterprise/index.vue b/src/views/vxEwm/enterprise/index.vue index 5c54b83..6a719f4 100644 --- a/src/views/vxEwm/enterprise/index.vue +++ b/src/views/vxEwm/enterprise/index.vue @@ -1,8 +1,15 @@ @@ -40,15 +48,14 @@ export default { }, methods: { backHome() { + console.log('sasasa') this.$router.back() }, handlerDownload() { let temp = document.createElement('a') // 创建a标签 const equipment = phoneIf() if (equipment == 'IOS') { - Toast('请点击右上角 “...” 选择默认浏览器打开') - // temp.href = - // 'https://apps.apple.com/cn/app/%E6%9C%A8%E6%B8%8E%E6%99%BA%E6%85%A7%E5%AE%89%E7%9B%91/id1597682147' // 设置下载名称 + temp.href = 'https://www.jichuanglanhai.com/demo/vx-url.html' // 设置下载名称 } else if (equipment == 'Android') { temp.href = 'https://www.pgyer.com/6TpZ' // 设置下载名称 } else { @@ -70,14 +77,26 @@ export default { background-size: cover; overflow: hidden; + .header-bg { + position: absolute; + top: 0; + left: 0; + height: 25vh; + width: 100%; + z-index: 9; + + background: url('~@/assets/image/vxEwm/bg1.png'); + background-size: 100% 100%; + } + .general-header { position: absolute; top: 1vh; left: 50%; transform: translateX(-50%); + z-index: 10; width: 4.8rem; height: 8.3vh; - background: url('~@/assets/image/vxEwm/logo.png'); background-size: 100% 100%; } @@ -88,16 +107,28 @@ export default { transform: translateY(-37%); height: 73%; width: 100%; + z-index: 20; background: #e8f3fc; border-radius: 30px; overflow: hidden; box-sizing: border-box; padding: 0.3rem 0.21rem 0 0.21rem; } + .footonte-bg { + position: absolute; + bottom: 0; + left: 0; + z-index: 9; + width: 100%; + height: 15vh; + background: url('~@/assets/image/vxEwm/bg2.png'); + background-size: 100% 100%; + } .general-view-two { position: absolute; top: 37%; transform: translateY(-37%); + z-index: 10; height: 73%; width: 100%; // background: #e8f3fc; @@ -108,7 +139,7 @@ export default { } .general-footnote { position: absolute; - bottom: 3vh; + bottom: 0; left: 0; z-index: 10; width: 100%; @@ -137,11 +168,12 @@ export default { font-size: 0.25rem; color: #fff; font-weight: bold; - text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6); + text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2); font-family: 'PingFang-SC-Regular'; } .download-btn { margin-top: 0.1rem; + padding-bottom: 3vh; display: flex; align-items: center; justify-content: center; diff --git a/src/views/vxEwm/enterprise/info.vue b/src/views/vxEwm/enterprise/info.vue index 8110108..1ffece4 100644 --- a/src/views/vxEwm/enterprise/info.vue +++ b/src/views/vxEwm/enterprise/info.vue @@ -240,7 +240,7 @@
{{ parkList.status | fiterStatus }}
-
+
入住园区
{{ parkList.parkName }}
diff --git a/src/views/vxEwm/garden/index.vue b/src/views/vxEwm/garden/index.vue index 00d7e63..a840db8 100644 --- a/src/views/vxEwm/garden/index.vue +++ b/src/views/vxEwm/garden/index.vue @@ -1,6 +1,7 @@ @@ -29,9 +31,7 @@ export default { let temp = document.createElement('a') // 创建a标签 const equipment = phoneIf() if (equipment == 'IOS') { - temp.href = - 'https://apps.apple.com/cn/app/%E6%9C%A8%E6%B8%8E%E6%99%BA%E6%85%A7%E5%AE%89%E7%9B%91/id1597682147' // 设置下载名称 - Toast('请点击右上角 “...” 选择默认浏览器打开') + temp.href = 'https://www.jichuanglanhai.com/demo/vx-url.html' // 设置下载名称 } else if (equipment == 'Android') { temp.href = 'https://www.pgyer.com/6TpZ' // 设置下载名称 } else { @@ -53,14 +53,25 @@ export default { background-size: cover; overflow: hidden; + .header-bg { + position: absolute; + top: 0; + left: 0; + height: 25vh; + width: 100%; + z-index: 9; + + background: url('~@/assets/image/vxEwm/bg1.png'); + background-size: 100% 100%; + } .general-header { position: absolute; top: 1vh; left: 50%; transform: translateX(-50%); + z-index: 10; width: 4.8rem; height: 8.3vh; - background: url('~@/assets/image/vxEwm/logo.png'); background-size: 100% 100%; } @@ -73,10 +84,21 @@ export default { width: 100%; background: #e8f3fc; border-radius: 30px; + z-index: 20; overflow: hidden; box-sizing: border-box; padding: 0.3rem 0.21rem 0 0.21rem; } + .footonte-bg { + position: absolute; + bottom: 0; + left: 0; + z-index: 9; + width: 100%; + height: 15vh; + background: url('~@/assets/image/vxEwm/bg2.png'); + background-size: 100% 100%; + } .general-footnote { position: absolute; bottom: 3vh; @@ -87,7 +109,7 @@ export default { font-size: 0.25rem; color: #fff; font-weight: bold; - text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6); + text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2); font-family: 'PingFang-SC-Regular'; } .download-btn { diff --git a/src/views/vxEwm/garden/park/index.vue b/src/views/vxEwm/garden/park/index.vue index 665e7da..6ae8578 100644 --- a/src/views/vxEwm/garden/park/index.vue +++ b/src/views/vxEwm/garden/park/index.vue @@ -246,12 +246,16 @@ export default { }, }, created() { - this.querParams.parkProfileId = this.$route.query.id + mapJson.forEach((item) => { + if (item.parkOrgId == this.$route.query.id) { + this.querParams.parkProfileId = item.id + } + }) + this.loading = Toast.loading('加载中...') this.$nextTick(() => { this.getList() this.initMap() - this.getWuzi() this.getFzr() this.loading.clear() @@ -331,7 +335,7 @@ export default { let parkId = this.$route.query.id let parkName = '' mapJson.forEach((item) => { - if (item.id == parkId) { + if (item.parkOrgId == parkId) { parkName = item.parkName } })