diff --git a/src/assets/css/font.css b/src/assets/css/font.css index 8909b96..35df0f7 100644 --- a/src/assets/css/font.css +++ b/src/assets/css/font.css @@ -46,4 +46,12 @@ font-family: 'PingFang-SC-Bold'; src: url('../css/font/DIN CONDENSED BOLD.TTF'); } +@font-face { + font-family: 'PingFang-SC-Medium'; + src: url('../css/font/PingFang Medium.ttf'); +} +@font-face { + font-family: 'PingFang-SC-Regular'; + src: url('../css/font/PingFang Regular.ttf'); +} diff --git a/src/assets/css/font/PingFang Medium.ttf b/src/assets/css/font/PingFang Medium.ttf new file mode 100644 index 0000000..982661b Binary files /dev/null and b/src/assets/css/font/PingFang Medium.ttf differ diff --git a/src/assets/css/font/PingFang Regular.ttf b/src/assets/css/font/PingFang Regular.ttf new file mode 100644 index 0000000..8790adb Binary files /dev/null and b/src/assets/css/font/PingFang Regular.ttf differ diff --git a/src/assets/image/vxEwm/logo.png b/src/assets/image/vxEwm/logo.png new file mode 100644 index 0000000..d7f617d Binary files /dev/null and b/src/assets/image/vxEwm/logo.png differ diff --git a/src/assets/newmap/index.js b/src/assets/newmap/index.js index 3e8440e..6801600 100644 --- a/src/assets/newmap/index.js +++ b/src/assets/newmap/index.js @@ -1,11 +1,13 @@ export default [ { + id: '1', parkOrgId: '948e4da9-ef4a-11eb-9790-00163e06dee2', parkName: '金星富民置业工业园', parkLayer: require('./木渎金星富民工业园(尧峰工业园)-楼栋.json'), floorLayer: require('./木渎金星富民工业园(尧峰工业园).json'), }, { + id: '2', parkOrgId: '948e5118-ef4a-11eb-9790-00163e06dee2', parkName: '金桥汽配产业园', parkLayer: require('./金桥汽配产业园-楼栋.json'), diff --git a/src/views/vxEwm/garden/index copy.vue b/src/views/vxEwm/garden/index copy.vue new file mode 100644 index 0000000..63a4cb4 --- /dev/null +++ b/src/views/vxEwm/garden/index copy.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/views/vxEwm/garden/index.vue b/src/views/vxEwm/garden/index.vue index dfd0947..bce9751 100644 --- a/src/views/vxEwm/garden/index.vue +++ b/src/views/vxEwm/garden/index.vue @@ -4,8 +4,9 @@
+
-
+
查看更多信息请下载 “安全木渎APP”
> 点击下载 @@ -17,34 +18,14 @@ @@ -54,69 +35,58 @@ export default { position: relative; top: 0; left: 0; - width: 100%; - height: 100vh; - overflow: hidden; -} -.general-header { - position: absolute; - top: 0; - left: 0; - z-index: 10; - width: 100%; - height: 16%; - background: url('~@/assets/image/vxEwm/top-header-bg.png'); - background-size: 100% 100%; -} -.general-view { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - z-index: 20; - width: 100%; - height: 80%; - background-color: #e8f3fc; - border-radius: 20px; + min-height: 100vh; + background: url('~@/assets/image/vxEwm/middle-bg.png'); + background-size: cover; overflow: hidden; - box-sizing: border-box; - padding: 0.3rem 0.21rem; -} -.general-footnote { - position: absolute; - bottom: 0; - left: 0; - z-index: 10; - width: 100%; - height: 20%; - background: url('~@/assets/image/vxEwm/bottom-foot-bg.png'); - background-size: 100% 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: flex-end; - .back-home { - width: 1.94rem; - height: 0.5rem; - background: url('~@/assets/image/vxEwm/backHome.png'); + + .general-header { + position: absolute; + top: 1vh; + left: 50%; + transform: translateX(-50%); + width: 4.8rem; + height: 8.3vh; + + background: url('~@/assets/image/vxEwm/logo.png'); background-size: 100% 100%; } - .app-download-hint { - width: 4.11rem; - height: 0.4rem; - margin: 0.1rem 0; - background: url('~@/assets/image/vxEwm/download-text.png'); - background-size: 100% 100%; + + .general-view { + position: absolute; + top: 46%; + transform: translateY(-46%); + height: 79%; + width: 100%; + background: #e8f3fc; + border-radius: 30px; + overflow: hidden; + box-sizing: border-box; + padding: 0.3rem 0.21rem 0 0.21rem; } - .download-btn { - margin-bottom: 0.1rem; - display: flex; - align-items: center; - justify-content: center; - color: #feffff; - a { - margin: 0 0.1rem; - text-decoration: underline; + .general-footnote { + position: absolute; + bottom: 3vh; + left: 0; + z-index: 10; + width: 100%; + .app-download-hint { + font-size: 0.25rem; + color: #fff; + font-weight: bold; + text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6); + font-family: 'PingFang-SC-Regular'; + } + .download-btn { + margin-top: 0.1rem; + display: flex; + align-items: center; + justify-content: center; + color: #feffff; + a { + margin: 0 0.1rem; + text-decoration: underline; + } } } } diff --git a/src/views/vxEwm/garden/park/components/enterpriseList.vue b/src/views/vxEwm/garden/park/components/enterpriseList.vue index b2e6ed9..49481db 100644 --- a/src/views/vxEwm/garden/park/components/enterpriseList.vue +++ b/src/views/vxEwm/garden/park/components/enterpriseList.vue @@ -20,13 +20,15 @@ @load="onLoad" >
- {{ item.name }} - + > +
{{ item.name }}
+
+
@@ -151,14 +153,33 @@ div { } .list-box { - border-radius: 28px; + border-radius: 25px; background-color: #fff; box-shadow: 0 2px 12px 0 #0000001a; + padding: 0 0.3rem; + + .list-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.2rem 0; + border-bottom: 1px solid RGBA(218, 218, 218, 0.6); + .item-name { + font-size: 0.24rem; + font-weight: bold; + color: #333333; + font-family: 'PingFang-SC-Regular'; + white-space: nowrap; /* 让文本只显示在一行 */ + overflow: hidden; /* 隐藏溢出部分 */ + text-overflow: ellipsis; /* 显示省略号 */ + } + } & > div:first-child { border-radius: 16px 16px 0 0; } & > div:last-child { border-radius: 0 0 16px 16px; + border: 0; } } /deep/.van-cell__value { diff --git a/src/views/vxEwm/garden/park/components/statistics.vue b/src/views/vxEwm/garden/park/components/statistics.vue index 62adac5..94816e1 100644 --- a/src/views/vxEwm/garden/park/components/statistics.vue +++ b/src/views/vxEwm/garden/park/components/statistics.vue @@ -410,6 +410,7 @@ div { box-sizing: border-box; } .statistics-container { + padding-bottom: 0.3rem; & > div { display: flex; align-items: center; diff --git a/src/views/vxEwm/garden/park/index.vue b/src/views/vxEwm/garden/park/index.vue index 07cda79..7aa56a2 100644 --- a/src/views/vxEwm/garden/park/index.vue +++ b/src/views/vxEwm/garden/park/index.vue @@ -48,9 +48,8 @@
@@ -77,6 +76,35 @@
+
+
+
+
+
网格员
+
+
+
+
+
{{ item.name }}
+
+
+
+ {{ item.phone }} +
+
+
+
+
@@ -209,6 +237,14 @@ export default { statistical, enterpriseList, }, + computed: { + handlerParkMan() { + return this.fuzeList.filter((item) => item.type == '园区负责人') + }, + handlerNetMan() { + return this.fuzeList.filter((item) => item.type == '网格员') + }, + }, created() { this.querParams.parkProfileId = this.$route.query.id this.loading = Toast.loading('加载中...') @@ -254,6 +290,7 @@ export default { getFzr() { listPrincipal(this.querParams).then((res) => { this.fuzeList = res.rows + console.log(this.fuzeList, '负责人') }) }, @@ -290,14 +327,23 @@ export default { //也可以直接用数据去接收 this.mapLayer.mapLayer1 = L.featureGroup() this.mapLayer.mapLayer2 = L.featureGroup() - let querys = this.$route.query - this.setParks(id, querys.name) + let parkId = this.$route.query.id + let parkName = '' + mapJson.forEach((item) => { + if (item.id == parkId) { + parkName = item.parkName + } + }) + if (!parkName) { + this.$message.error('暂无该工业园面数据...') + return + } + this.setParks(id, parkName) }, setParks(parkOrgId, name) { this.mapLayer.mapLayer1.clearLayers() //清除该图层中数据 this.parkName = name let mapObj = mapJson.filter((item) => item.parkName == name) - console.log(mapObj, '面数据') if (mapObj.length == 0) { this.$message.error('暂无该工业园面数据...') return @@ -405,7 +451,7 @@ div { width: 100%; display: flex; align-items: center; - margin-bottom: 0.5rem; + margin-bottom: 0.4rem; & > div { flex: 1; font-size: 0.25rem; @@ -429,10 +475,11 @@ div { } } .container-box { - height: calc(100% - 0.7rem); + height: calc(100% - 0.5rem); overflow-y: auto; } .tab-type { + padding-bottom: 0.2rem; .map { overflow: hidden; height: 5.58rem;