From 98f4621d2663f7c6be45d9676428476e32740942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Sat, 19 Nov 2022 17:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E7=B3=BB=E7=BB=9F=E9=A1=B5=E9=9D=A2-(=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E9=85=8D=E7=BD=AE=E3=80=81=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D)=E5=B9=B3=E9=9D=A2=E5=9B=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/deepFoundationPitManage/jz.png | Bin 0 -> 1639 bytes .../images/deepFoundationPitManage/ld.png | Bin 0 -> 1265 bytes .../ConfigChildrenIndex/configuration.vue | 4 +- .../ConfigChildrenIndex/positoningIndex.vue | 4 +- .../personnelPositioning.vue | 259 +++++++++--------- 5 files changed, 141 insertions(+), 126 deletions(-) create mode 100644 src/assets/images/deepFoundationPitManage/jz.png create mode 100644 src/assets/images/deepFoundationPitManage/ld.png diff --git a/src/assets/images/deepFoundationPitManage/jz.png b/src/assets/images/deepFoundationPitManage/jz.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fc8ee9381b2d46036545bae89e12e6e107b35f GIT binary patch literal 1639 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 b&9A~Y{{Cz6D*PNr00000NkvXXu0mjfS_ni7 literal 0 HcmV?d00001 diff --git a/src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue index 0043133d..f58e3117 100644 --- a/src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue +++ b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue @@ -138,8 +138,8 @@ diff --git a/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue index 9248ca01..359cd8d2 100644 --- a/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue +++ b/src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue @@ -154,8 +154,8 @@ diff --git a/src/views/projectFront/personnelPosition/personnelPositioning.vue b/src/views/projectFront/personnelPosition/personnelPositioning.vue index de5ff574..d538f4e8 100644 --- a/src/views/projectFront/personnelPosition/personnelPositioning.vue +++ b/src/views/projectFront/personnelPosition/personnelPositioning.vue @@ -20,9 +20,7 @@
-
+
- - + - +
+
@@ -149,8 +157,8 @@ export default { if (item.id == val) { this.mapUrl = item.imageUrl; this.$nextTick(() => { - this.getNaturalSize(); - }); + this.getNaturalSize(); + }); } }); console.log("this.mapUrl", this.mapUrl); @@ -191,7 +199,7 @@ export default { let _this = this; var img = new Image(); img.src = Domlement.src; - console.log("getNaturalSize 图片地址",img.src); + console.log("getNaturalSize 图片地址", img.src); img.onload = function () { natureSize.width = img.width; natureSize.height = img.height; @@ -233,7 +241,7 @@ export default { }).then((res) => { console.log("点位信息", res); if ((res.code = 200)) { - this.PointSummary = [] + this.PointSummary = []; this.baseStationList = res.result.baseStationList; this.figureBuildingList = res.result.figureBuildingList; @@ -242,15 +250,14 @@ export default { this.PointSummary.push(item); }); this.figureBuildingList.forEach((item) => { - console.log("item hotspot--",item.hotspot); - if(item.hotspot != null) { - let hstspot = JSON.parse(item.hotspot) - item.mapX = hstspot[0] - item.mapY = hstspot[1] - + console.log("item hotspot--", item.hotspot); + if (item.hotspot != null) { + let hstspot = JSON.parse(item.hotspot); + item.mapX = hstspot[0]; + item.mapY = hstspot[1]; } item.type = 1; - item.name = item.buildingName + item.name = item.buildingName; this.PointSummary.push(item); }); this.pointList = this.PointSummary; @@ -268,10 +275,9 @@ export default { type: val.type, }).then((res) => { console.log("查看点位信息详情 数据", res); - this.tableData = res.result + this.tableData = res.result; }); }, - }, }; @@ -287,113 +293,122 @@ export default { justify-content: space-between; align-items: center; } - height: 80%; - width: 100%; - position: relative; - // text-align: center; - .tag-box { - // position: absolute; - // top: 0; - // right: 0; - margin-top: 3px; - margin-bottom: 6px; + height: 80%; + width: 100%; + position: relative; + // text-align: center; + .tag-box { + // position: absolute; + // top: 0; + // right: 0; + margin-top: 3px; + margin-bottom: 6px; + display: flex; + justify-content: flex-end; + .tag-item { display: flex; - justify-content: flex-end; - .tag-item { - display: flex; - align-items: center; - margin-right: 76px; - span { - display: inline-block; - width: 8px; - height: 8px; - border-radius: 50%; - margin-right: 6px; - } + align-items: center; + margin-right: 76px; + span { + display: inline-block; + width: 8px; + height: 8px; + border-radius: 50%; + margin-right: 6px; } } - .img-box { - // margin: 0 auto; - // height: 100%; - // width: 100%; - // top: 50%; - transform: translateY(-50%); - transform-origin: left top; - position: relative; - img { + } + .img-box { + // margin: 0 auto; + // height: 100%; + // width: 100%; + // top: 50%; + transform: translateY(-50%); + transform-origin: left top; + position: relative; + img { + position: absolute; + width: 96%; + height: 755px; + display: block; + margin: 0 0 0 28px; + margin-top: 20px; + } + .point-list { + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + li { + display: inline-block; position: absolute; - width: 100% ; - height: 800px ; - display: block; - margin: 0 auto; - margin-top: 20px; } - .point-list { - width: 100%; - height: 100%; + .point-dialog { + background: rgba(#2a2e3f, 0.9); + color: #fff; + width: 238px; + height: auto; + box-sizing: border-box; + padding: 0 16px; + padding-bottom: 18px; position: absolute; + left: 50%; + top: -8px; + transform: translate(-50%, -100%); + font-size: 12px; + .el-icon-error { + position: absolute; + right: 12px; + top: 10px; + cursor: pointer; + } + .point-title { + // height: 40px; + line-height: 20px; + border-bottom: 1px solid rgba(254, 255, 255, 1); + margin-bottom: 13px; + font-size: 14px; + word-break: break-all; + padding: 10px 0; + } + .point-content { + font-size: 14px; + p { + line-height: 24px; + } + } + } + .point-title2 { + width: auto; + height: auto; + white-space: nowrap; + font-size: 16px; + padding: 10px 20px; + } + .right_detail { + left: 30px; top: 0; - left: 0; - li { - display: inline-block; - position: absolute; - } - .point-dialog { - background: rgba(#2a2e3f, 0.9); - color: #fff; - width: 238px; - height: auto; - box-sizing: border-box; - padding: 0 16px; - padding-bottom: 18px; - position: absolute; - left: 50%; - top: -8px; - transform: translate(-50%, -100%); - font-size: 12px; - .el-icon-error { - position: absolute; - right: 12px; - top: 10px; - cursor: pointer; - } - .point-title { - // height: 40px; - line-height: 20px; - border-bottom: 1px solid rgba(254, 255, 255, 1); - margin-bottom: 13px; - font-size: 14px; - word-break: break-all; - padding: 10px 0; - } - .point-content { - font-size: 14px; - p { - line-height: 24px; - } - } - } - .point-title2 { - width: auto; - height: auto; - white-space: nowrap; - font-size: 16px; - padding: 10px 20px; - } - .right_detail { - left: 30px; - top: 0; - transform: translate(0, 0); - } - .right_title { - left: 30px; - top: -8px; - transform: translate(0, 0); - } + transform: translate(0, 0); + } + .right_title { + left: 30px; + top: -8px; + transform: translate(0, 0); } } } - .el-select { - margin-right: 20px; +} +.el-select { + margin-right: 20px; +} +.noDataImgBox { + img { + width: 250px; + margin-bottom: 200px; } + p { + font-size: 20px; + } +} \ No newline at end of file