From c303eb4192a98b2a1a3c90db791bd7f030569b14 Mon Sep 17 00:00:00 2001 From: Rain <904416525@qq.com> Date: Mon, 21 Oct 2024 10:36:27 +0800 Subject: [PATCH] =?UTF-8?q?2024-10-21=20=E7=BB=98=E5=88=B6mars3d=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/mapbox/Group 1000015865.png | Bin 0 -> 214 bytes src/assets/images/mapbox/Group 1000015866.png | Bin 0 -> 390 bytes src/assets/images/mapbox/Group 31.png | Bin 0 -> 2560 bytes src/assets/images/mapbox/Rectangle 22.png | Bin 0 -> 414 bytes src/assets/images/mapbox/Rectangle 24.png | Bin 0 -> 2438 bytes .../images/mapbox/Rectangle 34624274.png | Bin 0 -> 455 bytes src/components/mars3d/MarsBox.vue | 90 +++++++++++--- src/components/mars3d/MarsBoxarea.vue | 112 +++++++++++++++--- .../quality/businessModule/checkPointer.vue | 35 ++++-- 9 files changed, 194 insertions(+), 43 deletions(-) create mode 100644 src/assets/images/mapbox/Group 1000015865.png create mode 100644 src/assets/images/mapbox/Group 1000015866.png create mode 100644 src/assets/images/mapbox/Group 31.png create mode 100644 src/assets/images/mapbox/Rectangle 22.png create mode 100644 src/assets/images/mapbox/Rectangle 24.png create mode 100644 src/assets/images/mapbox/Rectangle 34624274.png diff --git a/src/assets/images/mapbox/Group 1000015865.png b/src/assets/images/mapbox/Group 1000015865.png new file mode 100644 index 0000000000000000000000000000000000000000..abb2409c80a68d89022cabde35cc895324611653 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^{2ZH0TOaw&QD6_%2uoY89(__raO38^ zta9BmQ>!`eOemRDGUsHkk!QNnqH9skmsodv_sLnW`gXGP!-GrM`FGtvu-4RHU1RBl z^t-eF3)X#)z03Yv;-6OH%s|ifxJ}Fc-s$W~&%4T2an5wZUZ!>WdjHSf@wU$I1-gyF M)78&qol`;+00CG}qW}N^ literal 0 HcmV?d00001 diff --git a/src/assets/images/mapbox/Group 1000015866.png b/src/assets/images/mapbox/Group 1000015866.png new file mode 100644 index 0000000000000000000000000000000000000000..210d8e518c7fbb08be3e64e7a903094e6251bc73 GIT binary patch literal 390 zcmV;10eSw3P)Px$KuJVFR47xGl22;FP!Pty$sh0tQIrNZRs&+87jR?RJ9OWLix%2rbkR*0-Ft^t zHy)scil8Q0gp|aP8&pWllo4O4T?n1Ud+=kvnfcy4!ak6BI>pAdqof*WEE@E<_-PdjjV3Ig%tf5ZJbjPN$;;?;^MZ z@SsflzK=MLK}4`D3y$Obm}chN|39l#UaeNPrfDz77FU+#WxL&ucAJ)v1y-xo>;2d0 k5s|p}0F2T!eNtcJ8>736K6F&hlmGw#07*qoM6N<$g3B_g9{>OV literal 0 HcmV?d00001 diff --git a/src/assets/images/mapbox/Group 31.png b/src/assets/images/mapbox/Group 31.png new file mode 100644 index 0000000000000000000000000000000000000000..674b0146abbce591b2686ab69c9ddbfa88217b1a GIT binary patch literal 2560 zcmV+b3jg(qP)Px;x=BPqRCr$PUHMO3*A;%(ij)|N*@vBBHv=;;3tLzW*pS#sY$tz4D^*R@R#B8x zRijo>Q#o}jM^*PNQrfCg+g~a*!CSyK>kPxd3}!Lwz_4ReTq;%bs&kh&?}eFUro~|f z4zfIF9{1gM?sxAy-0z-q&n1>u=lv3qBuS?KOI()jfB5o6`W=4|0Ym^1I6wr5_3I0M zNsg)OkJkwg&(P{7R`k2bK=Q`{I*SkQr)U=;< z4Bor}vbmV&>^*cc>tFW0S+(RyqPaABN_dP>n^m@6~FfnfTfLwCgQa*LxF%EKZX;s{;ZKu$@`NZj05c?fb+a{8(5t+huWCnTnQY3JekKS4f~loI!7d-E~K z&%`C1+e5eE%g}NItAy!RI0Z zM;HOp_}wMHBr{3{GadRN%fxZ*BGRiP-0|2nMBuOxAWh%%GDAZkI8d4BNGE!)zAxxi zO*lwMhD&$inKZrlX9+S=CYwBNc7vf0+wGCaiS zRh6~1dBlFZ2jo!ns?ywCH#XeU4`np;s=Bep?YuikuZN;n#`>!9(Y_HVQ&v%Hns5(L zdR1z$RZe~`y)u_gPYzRhRajD0GBY(Y1#(f5vG~CQPOplMg|pM2O|NqFWx3u6=v8{A zUbiObRaSo5>aw6$c`55F3!9*WnqDO)Wh6e_4xe7d$0eNHMS68u@0aGedHLme;=;oG z_yWiWeGQfp#52T_La=K|X_==)x$SiyrRc$Qsj{{_E6R=7yYEG!b12YB^E*q5n;a+> zP%W72*ss2b^eQTbDk^bQ5IAT96Rf_NFgh*oF8hH_LC5kb5B)ND1&z*88SL1O=s*CC z4(kVU<_F8L@rqg;VRR(fPvq{aVR)}1qgU0ImL{j8n|rUC8(of`|H*r0FxFc=!Ms-$ z^;P5U{q!n4@0FTfnM!A-T>HIOVbCiWSYqlN%6pZaU7WGBG`-(@6@p%+q-G^;ZY*y@ zhiSc6x`gem)g8F5_Fly&q{Qv+p!X^|Oie%wG&W;K1UHm0 zY2m$62M31Od!?aQTJKf1cVTh~^vudB%v$!&?B9Ept=IXM_};59f&)`hvlBNrmiXSQ z;NGiKNUsjdu6*Wm(dcla^W4va7#%|7p0~~;y^6}Ai%P{R0%&x&(Ru!tYi#co-31Xy z(BA##d8AjdI=WHss6+sb4mUdIf4vrbB` zz%aa5>eLoUua4R49i7c3FMYTHN6=`slO=NFwdZglIXe3cwL%198Ub?g59`e0@Qt2g z#&i8^Xmnz_XHj`XAW9J+m;SWQQn6Et#e)PTN$UD48l5QZGgJ!^h-n1Ku**+o7Ri2VcPOm zvCd$&5Tc(7M)alN zzoR2atj_XBvN0yw4K1YQIlfB!6#N(rsu2qnvR8%iq!# literal 0 HcmV?d00001 diff --git a/src/assets/images/mapbox/Rectangle 22.png b/src/assets/images/mapbox/Rectangle 22.png new file mode 100644 index 0000000000000000000000000000000000000000..a39d8efcecec1d9175ec4401453994130c8afbce GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0y~yV3Y;2RXEsydN-Q|YskKi?VwV0x)0@Tl^=HT-p3oP+^1i2i7IpH$A`m<&^*foWax8&t;ucLK6VMD5C)Y literal 0 HcmV?d00001 diff --git a/src/assets/images/mapbox/Rectangle 24.png b/src/assets/images/mapbox/Rectangle 24.png new file mode 100644 index 0000000000000000000000000000000000000000..6a92ab775f5f1ac420efd273ca7f1fffacb016e0 GIT binary patch literal 2438 zcmeAS@N?(olHy`uVBq!ia0y~yV3Y-7Wezr=2*1?TWk8CtILO_JVcj{ImkbP?4xTQK zAr*0NuQ;w{Vi0h43}|7HSfawXJ|*njaA3oMmqq&}=RRZ)nCqaMP?A+x$#RUf=iCqG75)pv46L^9uwi=4 zK|}7+wjlVD0hK)$2d7qv4`tJ;PVdD@<<7#iqL_#2k3h zW8d(LC5v%!aQA6t1HFWjWAYBQOj{c+t~~lwP(s|m>M{QUyT+&kFRncL#L)vZ_9J`1 z{88&i1AjE>jb^;jVrR6_9j$UkD_oj2H~#dW+tK`sg`Px$fk{L`R9Hv7S4j@SFbs6dFS+s)4m^Y-PXY;kQbCYXj1_yvX`q*?isSJzo}`m} zo}GxyA~Gf3)i&Cv*9uzsW^ow*#fG(Gachj3c&qPB{d7ENKT}7h4hYAK-`0-J)7!_y z@eq-dh@1;pZAJ??O1uR$qEOZ^lMqWl6yLf&&-1h_3+va5*%GnTx(LF1xD-Yf$FoQI zMT5civzM?oHZ&00e(w=AOVAO8LldeCspH#PIE4Ev#b$8z>BHKycB}xPA&l@^ed;0X zwGtI=&Jqz3J#(ZoO7F!#LaCyLW)zGi(3hQ~>`cD@7+_DKGySIq!76Gr0a{s5gS>UL z4;}lzCSH$!R+$h{JwKU2Vd`7_c|yS|Ai~+w|5m
边框颜色：
-
+
@@ -49,7 +49,7 @@
填充颜色：
-
+
@@ -57,7 +57,7 @@
文字颜色：
-
+
@@ -75,7 +75,7 @@
是否虚线：
- +
@@ -125,7 +125,7 @@ @click="onmapitem(item)" >{{item.name}}
-
--> +
-->
@@ -846,15 +846,20 @@ export default { position: relative; .mars-3d-deleter { - width: 296px; + width: 300px; display: flex; align-items: center; justify-content: space-between; padding: 0 15px; height: 42px; - border-left: 5px solid #52a3de; - border-bottom: 2px solid #52a3de; - background: #3c444f; + // border-left: 5px solid linear-gradient(180deg, #3170e2 0%, #52b2ee 100%); + // border-bottom: 2px solid #4faced; + background: rgba(11, 22, 51, 0.3); + background-image: url("~@/assets/images/mapbox/Group 31.png"); + background-position: center center; + background-repeat: no-repeat; + + background-size: 100% 100%; color: #ffffff; // box-sizing: border-box; @@ -870,7 +875,11 @@ export default { width: 300px; height: 420px; - background: #3c444f; + // background: #3c444f; + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; z-index: 1000; padding: 0 15px 15px; display: flex; @@ -886,8 +895,12 @@ export default { line-height: 45px; padding-left: 15px !important; padding-right: 15px !important; - background: #2a3653; - border: 1px solid #344c7b; + // background: #2a3653; + + // border: 1px solid #344c7b; + background-image: url("~@/assets/images/mapbox/Rectangle 22.png"); + background-size: 100% 100%; + background-repeat: no-repeat; position: absolute; left: 0; padding: 0; @@ -925,6 +938,24 @@ export default { width: 100px; } + .distinction { + // background: skyblue; + display: flex; + // align-items: flex-start; + align-items: center; + + input { + width: 140px !important; + } + + ::v-deep .el-color-picker--small .el-color-picker__trigger { + width: 23px !important; + height: 23px !important; + margin-right: 8px !important; + margin-top: 5px !important; + } + } + .mar3d-con { flex: 1; display: flex; @@ -933,7 +964,25 @@ export default { // background: skyblue; .block { - width: 200px; + width: 180px; + + ::v-deep .el-slider__runway { + background-image: url("~@/assets/images/mapbox/Rectangle 34624274.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + + .el-slider__bar { + background: transparent !important; + } + + .el-slider__button { + // background: yellow !important; + background-image: url("~@/assets/images/mapbox/Group 1000015866.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + border: 0px !important; + } + } } } } @@ -949,7 +998,7 @@ export default { top: 30px; left: 20px; - background: skyblue; + // background: skyblue; display: flex; flex-direction: column; @@ -957,9 +1006,10 @@ export default { // background: red !important; input { - border: 1px solid #516182; - background: #4a5261 !important; - color: #ffffff; + border: 1px solid #3e62a6; + background: #778098; + + color: #fff; } i { @@ -979,8 +1029,10 @@ export default { .sea-list { width: 100%; flex: 1; - background: #434447 !important; - border: 1px solid rgba(66, 70, 78 / 0.1); + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; box-sizing: border-box; color: #ffffff; diff --git a/src/components/mars3d/MarsBoxarea.vue b/src/components/mars3d/MarsBoxarea.vue index 5506f2e3..c3a4f230 100644 --- a/src/components/mars3d/MarsBoxarea.vue +++ b/src/components/mars3d/MarsBoxarea.vue @@ -2,7 +2,17 @@
-
+ +
+ {{ !latlntswtich ? '绘制面' : '获取经纬度'}} + +
+ +
多边形面 @@ -22,14 +32,14 @@
区域名称：
-
+
边框颜色：
-
+
@@ -37,7 +47,7 @@
填充颜色：
-
+
@@ -45,7 +55,7 @@
文字颜色：
-
+
@@ -63,7 +73,7 @@
是否虚线：
- +
@@ -74,12 +84,7 @@
-
-
- 经纬度数据 - -
- +
当前经度：
@@ -699,14 +704,49 @@ export default { .mars3d-com { position: relative; - .mars3d-box { + .mars-3d-deleter { + width: 300px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 15px; + height: 42px; + // border-left: 5px solid linear-gradient(180deg, #3170e2 0%, #52b2ee 100%); + // border-bottom: 2px solid #4faced; + background: rgba(11, 22, 51, 0.3); + background-image: url("~@/assets/images/mapbox/Group 31.png"); + background-position: center center; + background-repeat: no-repeat; + + background-size: 100% 100%; + color: #ffffff; + // box-sizing: border-box; + position: absolute; right: 50px; - top: 50px; + top: 20px; + } + + .mars3d-jinwei { + height: 220px !important; + } + + .mars3djinwie-box { + height: 220px !important; + } + + .mars3d-box, + .mars3djinwie-box { + position: absolute; + right: 50px; + top: 70px; width: 300px; height: 420px; - background: #3c444f; + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; z-index: 1000; padding: 0 15px 15px; display: flex; @@ -722,7 +762,9 @@ export default { line-height: 45px; padding-left: 15px !important; padding-right: 15px !important; - background: #2a3653; + background-image: url("~@/assets/images/mapbox/Rectangle 22.png"); + background-size: 100% 100%; + background-repeat: no-repeat; border: 1px solid #344c7b; position: absolute; left: 0; @@ -761,13 +803,49 @@ export default { width: 100px; } + .distinction { + // background: skyblue; + display: flex; + // align-items: flex-start; + align-items: center; + + input { + width: 140px !important; + } + + ::v-deep .el-color-picker--small .el-color-picker__trigger { + width: 23px !important; + height: 23px !important; + margin-right: 8px !important; + margin-top: 5px !important; + } + } + .mar3d-con { flex: 1; display: flex; align-items: center; .block { - width: 200px; + width: 180px; + + ::v-deep .el-slider__runway { + background-image: url("~@/assets/images/mapbox/Rectangle 34624274.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + + .el-slider__bar { + background: transparent !important; + } + + .el-slider__button { + // background: yellow !important; + background-image: url("~@/assets/images/mapbox/Group 1000015866.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + border: 0px !important; + } + } } } } diff --git a/src/views/projectFront/quality/businessModule/checkPointer.vue b/src/views/projectFront/quality/businessModule/checkPointer.vue index 61a87c0e..727fa957 100644 --- a/src/views/projectFront/quality/businessModule/checkPointer.vue +++ b/src/views/projectFront/quality/businessModule/checkPointer.vue @@ -443,12 +443,13 @@ - - -
- -
- +
+ +
+ +
+ +