From 83155b1f79ebfb1971876437d2d78ef8d64f18b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com> Date: Sat, 16 Mar 2024 12:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 +- src/assets/css/all-style.css | 12 ++++++ .../vxEwm/enterprise/components/firmInfo.vue | 41 ++++++++++++------- src/views/vxEwm/enterprise/index.vue | 4 +- src/views/vxEwm/enterprise/info.vue | 8 +++- src/views/vxEwm/garden/index.vue | 4 +- .../garden/park/components/statistics.vue | 9 +++- 7 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/App.vue b/src/App.vue index be33d5c..bd75d75 100644 --- a/src/App.vue +++ b/src/App.vue @@ -63,9 +63,7 @@ body { width: 100%; z-index: 2000; } -::-webkit-scrollbar { - // display: none; /*隐藏滚轮*/ -} + // 输入框填充密码背景 input:-webkit-autofill, textarea:-webkit-autofill, diff --git a/src/assets/css/all-style.css b/src/assets/css/all-style.css index d55ea08..29e9a0b 100644 --- a/src/assets/css/all-style.css +++ b/src/assets/css/all-style.css @@ -310,4 +310,16 @@ text-shadow: -1px -1px 0 white, -1px 1px 0 white, 1px 1px 0 white; +} +.check-icon{ + position: relative; + div{ + position: absolute; + top: -0.33rem; + left: 0; + width: 0.28rem; + height: 0.33rem; + background: url(../image/vxEwm/location.png); + background-size: 100% 100%; + } } \ No newline at end of file diff --git a/src/views/vxEwm/enterprise/components/firmInfo.vue b/src/views/vxEwm/enterprise/components/firmInfo.vue index a87d403..bb2077e 100644 --- a/src/views/vxEwm/enterprise/components/firmInfo.vue +++ b/src/views/vxEwm/enterprise/components/firmInfo.vue @@ -26,11 +26,11 @@
{{ checksinfo.inAddress }}
- + /> -->
@@ -97,7 +97,6 @@ export default { mounted() { this.$nextTick(() => { this.initMap() - this.initData() }) }, methods: { @@ -124,6 +123,8 @@ export default { minZoom: 5, }) .addTo(this.globalMap) + + this.initData() }, // 初始化数据 initData() { @@ -141,6 +142,13 @@ export default { var longitude = Number(res.data.longitude) var latitude = Number(res.data.latitude) this.showPosition = true + var myIcon = L.divIcon({ + className: 'check-icon', + html: '
', + iconSize: [0, 0], + }) + + L.marker([latitude, longitude], { icon: myIcon }).addTo(this.globalMap) this.globalMap.setView([latitude, longitude], 16) if (!res.data.inImgRelationID) { @@ -255,24 +263,26 @@ div { .item-two-value { margin-top: 0.16rem; .two-value-wai-bg { - // margin: 0.16rem 0; - padding: 0.14rem 0.3rem; box-sizing: border-box; + padding: 0.14rem 0.3rem; width: 100%; - height: 0.5rem; - background: url('~@/assets/image/vxEwm/value-wai-bg.png'); - background-size: 100% 100%; + // border: 1px solid red; + // background: url('~@/assets/image/vxEwm/value-wai-bg.png'); + // background-size: 100% 100%; + border-radius: 28px; + background: #f1f1f1; display: flex; align-items: center; .two-value-nei-bg { - display: flex; - align-items: center; - justify-content: center; - width: 0.29rem; - height: 0.29rem; - background: url('~@/assets/image/vxEwm/value-nei-bg.png'); - background-size: 100% 100%; span { + display: flex; + align-items: center; + justify-content: center; + width: 0.28rem; + height: 0.29rem; + background: orange; + border-radius: 50%; + text-align: center; font-weight: bold; font-size: 0.19rem; color: #ffffff; @@ -280,6 +290,7 @@ div { } } .value-title { + text-align: left; font-weight: 500; font-size: 0.21rem; color: #333333; diff --git a/src/views/vxEwm/enterprise/index.vue b/src/views/vxEwm/enterprise/index.vue index e6703d0..72f4885 100644 --- a/src/views/vxEwm/enterprise/index.vue +++ b/src/views/vxEwm/enterprise/index.vue @@ -109,8 +109,8 @@ export default { z-index: 10; width: 4.8rem; height: 8.3vh; - background: url('~@/assets/image/vxEwm/logo.png'); - background-size: 100% 100%; + background: url('~@/assets/image/vxEwm/logo.png') center no-repeat; + background-size: 100% auto; } .general-view { diff --git a/src/views/vxEwm/enterprise/info.vue b/src/views/vxEwm/enterprise/info.vue index f09a894..fde5bbd 100644 --- a/src/views/vxEwm/enterprise/info.vue +++ b/src/views/vxEwm/enterprise/info.vue @@ -627,10 +627,11 @@ img { justify-content: space-between; } .two-rows { - padding: 0.2rem 0.42rem; + padding: 0.2rem 0.25rem; min-height: 1rem; background: #fff; border-radius: 28px; + // border: 1px solid red; } } } @@ -837,4 +838,9 @@ img { .svan-label span { flex: 1; } + +.right-unit { + // border: 1px solid red; + margin-top: 0.08rem; +} diff --git a/src/views/vxEwm/garden/index.vue b/src/views/vxEwm/garden/index.vue index 44e889b..2fa744f 100644 --- a/src/views/vxEwm/garden/index.vue +++ b/src/views/vxEwm/garden/index.vue @@ -72,8 +72,8 @@ export default { z-index: 10; width: 4.8rem; height: 8.3vh; - background: url('~@/assets/image/vxEwm/logo.png'); - background-size: 100% 100%; + background: url('~@/assets/image/vxEwm/logo.png') center no-repeat; + background-size: 100% auto; } .general-view { diff --git a/src/views/vxEwm/garden/park/components/statistics.vue b/src/views/vxEwm/garden/park/components/statistics.vue index a32a43b..c4c3768 100644 --- a/src/views/vxEwm/garden/park/components/statistics.vue +++ b/src/views/vxEwm/garden/park/components/statistics.vue @@ -442,7 +442,7 @@ div { } .icon-name { font-weight: 500; - font-size: 0.25rem; + font-size: 0.2rem; color: #666666; } .num-data { @@ -592,4 +592,11 @@ div { } } } +.num-unit, +.order-unit, +.unit, +.data-unit { + margin-top: 0.08rem; + // border: 1px solid red; +}