From 78cc8810c870900c42d712270373df59de9dfa6c Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 20 Nov 2024 17:16:09 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zhjs/subnvue/index.nvue |  54 +++++++++++++++++++---------------
 static/tabs/shenliu1.png      | Bin 0 -> 216 bytes
 static/tabs/shenliu1.svg      |   6 ++++
 static/tabs/shenliu2.svg      |   6 ++++
 4 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 static/tabs/shenliu1.png
 create mode 100644 static/tabs/shenliu1.svg
 create mode 100644 static/tabs/shenliu2.svg

diff --git a/pages/zhjs/subnvue/index.nvue b/pages/zhjs/subnvue/index.nvue
index c7e303c..a5c05c5 100644
--- a/pages/zhjs/subnvue/index.nvue
+++ b/pages/zhjs/subnvue/index.nvue
@@ -9,8 +9,11 @@
     		top: '-' + statusBarHeight + 'px'
     	}" id="map" ref="map" :latitude="latitude" :longitude="longitude" :markers="marker"
             :show-location="true" scale="16.5" :enable-satellite="enableSatellite" theme="satellite" @markertap="markertap">
-
-                <cover-image src="/static/tabs/dingwei.png" class="location" @click="onControlTap"></cover-image>
+                <image src="/static/tabs/dingwei.png" class="location" @click="onControlTap"></image>
+                <view class="tc-style">
+                <image src="/static/tabs/dingwei.png" style="width: 45rpx;height: 45rpx;" @click="onControlTap"></image>
+                 <view style="font-size: 10rpx;">图层</view>
+                </view>
         </map>
          
     </view>
@@ -26,19 +29,12 @@
                   {
                     latitude: 31.4954,
                     longitude: 114.7693,
-                    iconPath: '/static/tabs/add.png',
-                    width: "25",
-                    height: "25",
+                    iconPath: '/static/tabs/shenliu1.png',
+                    width: "20",
+                    height: "20",
                     id:1,
+                    title:"渗流监测"
                 },
-                {
-                    latitude: 31.4951,
-                    longitude: 114.767,
-                    iconPath: '/static/tabs/add.png',
-                    width: "25",
-                    height: "25",
-                    id:2,
-                }
                 ],
                 dingwei: '../../static/tabs/dingwei.png',
                 map:null,
@@ -73,18 +69,18 @@
               if(item.id === e.detail.markerId){
                 item.height=55;
                 item.width=55;
-                item.label={
-                  content:"测试",
-                  color:"#57a7f0",
-                  bgColor:"transparent"
-                }
+                // item.label={
+                //   content:"测试",
+                //   color:"#57a7f0",
+                //   bgColor:"transparent"
+                // }
               }else{
                 item.height=25;
                 item.width=25;
-               item.label={
-                 content:" ",
-                 bgColor:"transparent"
-               }
+               // item.label={
+               //   content:" ",
+               //   bgColor:"transparent"
+               // }
               }
             }));
             console.log("newMarker",newMarker);
@@ -104,9 +100,21 @@
     position: absolute;
     width: 35px;
     height:35px;
-    bottom: 130px;
+    bottom: 50px;
     left:10px;
     background-color: #fff;
     padding: 5px;
    }
+   .tc-style{
+     display: flex;
+     align-items: center;
+     position: absolute;
+     font-size: 12px;
+    padding: 5px;
+     top: 200px;
+     right:10px;
+     background-color: #fff;
+    
+     // padding: 5px;
+   }
 </style>
\ No newline at end of file
diff --git a/static/tabs/shenliu1.png b/static/tabs/shenliu1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c036a86b508acb2849d4b47c859bf82d87f8d06
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!2%>7RxY^$q?nSt-CY>|xA&jf59Cesba4!k
zkYqh*sK?B};BYbgswc1S8=>7Z)*Lw^%X3%Nr{t=!Nm%)Y?;O+E*bM|TRi=9M+^=R}
z_@E@sz_9I)Cj*0wSJLs`V)1pdI}gPOG53ds&8ykH<@M>kTN5%;QZl5g`FQ4ZZ8Z1x
zUVrSJit+rW<lx|Ru}OD+32exJcDK2+lhg0W=6KIZDS5heDxQ;6X4k7}I?6><^gaeU
Oj=|H_&t;ucLK6VqzD%S5

literal 0
HcmV?d00001

diff --git a/static/tabs/shenliu1.svg b/static/tabs/shenliu1.svg
new file mode 100644
index 0000000..968452a
--- /dev/null
+++ b/static/tabs/shenliu1.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="12px" height="11px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -15 -4 )">
+    <path d="M 11.5714688461538 0.0109133629120879  C 11.8069478571429 0.0109133629120879  11.9989307582418 0.199800905645604  12 0.433347905782967  L 12 10.5710448330082  C 11.9985380258089 10.8020769307568  11.8081043571847 10.9899447538017  11.5714688461538 11  L 0.427461912087912 11  C 0.190826401057018 10.9899447538017  0.000392732432886526 10.8020769307568  0 10.5710448330082  L 0 9.5951258568544  C 0 9.36157885671703  0.19198289010989 9.17342343711539  0.428211846153846 9.17342343711539  C 3.08522507692308 9.17342343711539  5.48576116483516 7.92149437281593  7.09361787912088 5.95940671811813  L 7.14311347252747 5.95867459498626  L 7.17161092307692 5.92572909696429  L 7.18435979120879 5.92572909696429  L 7.14986286813187 5.9579424718544  L 9.02094613186813 5.95867459498626  L 9.02094613186813 6.29984356677198  C 9.02094613186813 6.44700014462912  9.10493864835165 6.58171063997253  9.23767681318681 6.64833375914835  C 9.37041498901099 6.71422476592033  9.53015074725275 6.70251080653846  9.65014006593406 6.61538826112638  L 10.7450424945055 5.83421381276099  C 10.8490589595378 5.76037072475438  10.9106007313283 5.64239519945732  10.9106007313283 5.51683881057692  C 10.9106007313283 5.39128242169653  10.8490589595378 5.27330689639947  10.7450424945055 5.19946380839286  L 9.65014006593406 4.41755723689561  C 9.52989789469766 4.33153744811413  9.37015185910836 4.31934483427454  9.23767681318681 4.38607598513736  C 9.10467855785693 4.45311922060107  9.02108063064958 4.58697497930432  9.02094613186813 4.73310193125  L 9.02094613186813 5.07427090303572  L 7.72581153846154 5.07427090303572  C 8.61534941231483 3.67649424592434  9.10263937071599 2.07053900107551  9.13643583516483 0.425294562060442  C 9.14127525477334 0.197002487896079  9.33076824862488 0.0136298541688883  9.56464768131868 0.0109133629120899  L 11.5707189230769 0.0109133629120899  Z M 9.24217641758242 7.34311778523352  C 9.10888732707682 7.40996058240335  9.02497506834613 7.54385634053877  9.0246958021978 7.69014374207418  L 9.0246958021978 8.03131271385989  L 5.55250520879121 8.03131271385989  L 5.55250520879121 8.92010913387363  L 9.0246958021978 8.92010913387363  L 9.0246958021978 9.26127810565934  C 9.02544573626374 9.40770256038462  9.10943825274725 9.54241305572802  9.24217641758242 9.6083040625  C 9.37491459340659 9.67492719240385  9.53390041758242 9.66248110989011  9.65463965934066 9.57682280001374  L 10.7487921648352 8.79491622851648  C 10.8518657711908 8.71888227517532  10.9128431835702 8.60036505268833  10.9137774615385 8.47424668296703  C 10.9140308629298 8.3486616604618  10.8526991522799 8.23054445018368  10.7487921648352 8.15650561921703  L 9.65388972527472 7.37533117085165  C 9.5337945956088 7.28907454969914  9.37404108169104 7.27659779776908  9.24142648351648 7.34311778523352  Z M 3.00273241758242 5.93378244068681  C 3.11672226373626 5.93378244068681  3.22546257142857 5.97844189809066  3.30495549450549 6.05824322291209  L 3.85990604395604 6.60440642487637  L 4.41785631868132 6.05824322291209  C 4.49756429414398 5.97973244487678  4.60610021151019 5.93556657933071  4.71932945604396 5.93556657933071  C 4.83255870057772 5.93556657933071  4.94109461794393 5.97973244487678  5.02080259340659 6.05824322291209  C 5.18820476021256 6.22270928310647  5.18820476021256 6.48826043774518  5.02080259340659 6.65272649793956  L 4.16437891208791 7.49613133741758  C 4.0843052473184 7.57373809414204  3.97604892415406 7.61728991821509  3.8632162683615 7.61728991821509  C 3.74673671193157 7.61728991821509  3.63530149284488 7.57088589147757  3.55468324175824 7.48881011682692  L 2.99973269230769 6.94191479173077  L 2.44178240659341 7.49247073248626  C 2.36247914534943 7.57171714960591  2.25379176388569 7.61639413195056  2.14030927472527 7.61639413195056  C 2.02682678556486 7.61639413195056  1.91813940410112 7.57171714960591  1.83883614285714 7.49247073248626  L 0.986162120879121 6.65272649793956  C 0.90519508930959 6.57400509910622  0.859680397171686 6.46704212275323  0.859680397171686 6.35548486042583  C 0.859680397171686 6.24392759809842  0.90519508930959 6.13696462174543  0.986162120879121 6.05824322291209  C 1.06556781198205 5.97918225145672  1.17421687928163 5.93463438559322  1.28763525824176 5.93463438559322  C 1.40105363720189 5.93463438559322  1.50970270450146 5.97918225145672  1.5891083956044 6.05824322291209  L 2.14405894505494 6.60440642487637  L 2.70200921978022 6.05824322291209  C 2.78126926734732 5.97886914175464  2.88993668730591 5.93400666261216  3.00348235164835 5.93378244068681  Z M 4.72007938461538 3.39844304960165  C 4.83256936263736 3.39844304960165  4.94130967032967 3.44237038387363  5.02080259340659 3.52290384255495  L 5.57575313186813 4.06906704451923  L 6.13370341758242 3.52217171942308  C 6.21351052047281 3.44384232146515  6.32200930933447 3.39980203903012  6.43517655494505 3.39980203903012  C 6.54834380055564 3.39980203903012  6.6568425894173 3.44384232146515  6.73664969230769 3.52217171942308  C 6.90405185911366 3.68663777961746  6.90405185911366 3.95218893425617  6.73664969230769 4.11665499445055  L 5.87947607692308 4.96079195706044  C 5.79949762136295 5.03858441783658  5.69119955051517 5.08226376244097  5.57830026249046 5.08226376244097  C 5.46175981568596 5.08226376244097  5.35029011644669 5.03573022628531  5.26978040659341 4.95347073646978  L 4.71482985714286 4.4065754006456  L 4.15687957142857 4.95347073646978  C 4.07757631018459 5.03271715358943  3.96888892872086 5.07739413593408  3.85540643956044 5.07739413593408  C 3.74192395040002 5.07739413593408  3.63323656893629 5.03271715358943  3.55393330769231 4.95347073646978  L 2.99973269230769 4.4065754006456  L 2.44178240659341 4.9571313414011  C 2.36247914534943 5.03637775852075  2.25379176388569 5.0810547408654  2.14030927472527 5.0810547408654  C 2.02682678556486 5.0810547408654  1.91813940410112 5.03637775852075  1.83883614285714 4.9571313414011  L 0.986162120879121 4.11665499445055  C 0.90491647276154 4.03777891467085  0.859235065250892 3.93053557444913  0.859235065250892 3.81867640421322  C 0.859235065250892 3.58737080992754  1.05070522262328 3.39955075548069  1.28763525274725 3.39844304960165  C 1.40087516483516 3.39844304960165  1.50961547252747 3.44237038387363  1.5891083956044 3.52290384255494  L 2.14405894505495 4.06906704451923  L 2.70200921978022 3.52217171942308  C 2.78141491088315 3.44311074796771  2.89006397818273 3.39856288210421  3.00348235714286 3.39856288210421  C 3.11690073610299 3.39856288210421  3.22554980340256 3.44311074796771  3.30495549450549 3.52217171942308  L 3.85990604395604 4.06906704451923  L 4.41785631868132 3.52217171942308  C 4.49724154977031 3.44306671947746  4.60589318855707 3.39847461052997  4.71932945054945 3.39844304960165  Z " fill-rule="nonzero" fill="#000000" stroke="none" transform="matrix(1 0 0 1 15 4 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/static/tabs/shenliu2.svg b/static/tabs/shenliu2.svg
new file mode 100644
index 0000000..7e69837
--- /dev/null
+++ b/static/tabs/shenliu2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="22px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -12 0 )">
+    <path d="M 23.1414378461538 0.0218267258241799  L 23.1429376923077 0.0218267258241758  C 23.6138957142857 0.0218267258241758  23.9978615164835 0.399601811291209  24 0.866695811565934  L 24 21.1420896660165  C 23.9970760516177 21.6041538615136  23.6162087143695 21.9798895076035  23.1429376923077 22  L 0.854923824175824 22  C 0.381652802114037 21.9798895076035  0.000785464865773053 21.6041538615136  0 21.1420896660165  L 0 19.1902517137088  C 0 18.7231577134341  0.38396578021978 18.3468468742308  0.856423692307692 18.3468468742308  C 6.17045015384615 18.3468468742308  10.9715223296703 15.8429887456319  14.1872357582418 11.9188134362363  L 14.2862269450549 11.9173491899725  L 14.3432218461538 11.8514581939286  L 14.3687195824176 11.8514581939286  L 14.2997257362637 11.9158849437088  L 18.0418922637363 11.9173491899725  L 18.0418922637363 12.599687133544  C 18.0418922637363 12.8940002892582  18.2098772967033 13.1634212799451  18.4753536263736 13.2966675182967  C 18.740829978022 13.4284495318407  19.0603014945055 13.4050216130769  19.3002801318681 13.2307765222528  L 21.490084989011 11.668427625522  C 21.6981179190756 11.5207414495088  21.8212014626567 11.2847903989146  21.8212014626567 11.0336776211538  C 21.8212014626567 10.7825648433931  21.6981179190756 10.5466137927989  21.490084989011 10.3989276167857  L 19.3002801318681 8.83511447379121  C 19.0597957893953 8.66307489622826  18.7403037182167 8.63868966854908  18.4753536263736 8.77215197027473  C 18.2093571157139 8.90623844120213  18.0421612612992 9.17394995860865  18.0418922637363 9.4662038625  L 18.0418922637363 10.1485418060714  L 15.4516230769231 10.1485418060714  C 17.2306988246297 7.35298849184869  18.205278741432 4.14107800215102  18.2728716703297 0.850589124120883  C 18.2825505095467 0.394004975792158  18.6615364972498 0.0272597083377765  19.1292953626374 0.0218267258241799  L 23.1414378461538 0.0218267258241799  Z M 18.482852967033 14.686235570467  L 18.4843528351648 14.686235570467  C 18.2177746541536 14.8199211648067  18.0499501366923 15.0877126810775  18.0493916043956 15.3802874841484  L 18.0493916043956 16.0626254277198  L 11.1050104175824 16.0626254277198  L 11.1050104175824 17.8402182677473  L 18.0493916043956 17.8402182677473  L 18.0493916043956 18.5225562113187  C 18.0508914725275 18.8154051207692  18.2188765054945 19.084826111456  18.4843528351648 19.216608125  C 18.7498291868132 19.3498543848077  19.0678008351648 19.3249622197802  19.3092793186813 19.1536456000275  L 21.4975843296703 17.589832457033  C 21.7037315423817 17.4377645503506  21.8256863671404 17.2007301053767  21.8275549230769 16.9484933659341  C 21.8280617258596 16.6973233209236  21.7053983045599 16.4610889003674  21.4975843296703 16.3130112384341  L 19.3077794505494 14.7506623417033  C 19.0675891912176 14.5781490993983  18.7480821633821 14.5531955955382  18.482852967033 14.686235570467  Z M 6.0069647032967 11.8675648813736  L 6.00546483516484 11.8675648813736  C 6.23344452747253 11.8675648813736  6.45092514285714 11.9568837961813  6.60991098901099 12.1164864458242  L 7.71981208791209 13.2088128497527  L 8.83571263736264 12.1164864458242  C 8.99512858828796 11.9594648897536  9.21220042302038 11.8711331586614  9.43865891208791 11.8711331586614  C 9.66511740115544 11.8711331586614  9.88218923588786 11.9594648897536  10.0416051868132 12.1164864458242  C 10.3764095204251 12.4454185662129  10.3764095204251 12.9765208754904  10.0416051868132 13.3054529958791  L 8.32875782417582 14.9922626748352  C 8.16861049463679 15.1474761882841  7.95209784830813 15.2345798364302  7.72643253672299 15.2345798364302  C 7.49347342386314 15.2345798364302  7.27060298568976 15.1417717829551  7.10936648351648 14.9776202336538  L 5.99946538461539 13.8838295834615  L 4.88356481318681 14.9849414649725  C 4.72495829069885 15.1434342992118  4.50758352777138 15.2327882639011  4.28061854945055 15.2327882639011  C 4.05365357112972 15.2327882639011  3.83627880820225 15.1434342992118  3.67767228571429 14.9849414649725  L 1.97232424175824 13.3054529958791  C 1.81039017861918 13.1480101982124  1.71936079434337 12.9340842455065  1.71936079434337 12.7109697208517  C 1.71936079434337 12.4878551961968  1.81039017861918 12.2739292434909  1.97232424175824 12.1164864458242  C 2.13113562396411 11.9583645029134  2.34843375856326 11.8692687711864  2.57527051648352 11.8692687711864  C 2.80210727440378 11.8692687711864  3.01940540900293 11.9583645029134  3.17821679120879 12.1164864458242  L 4.28811789010989 13.2088128497527  L 5.40401843956044 12.1164864458242  C 5.56253853469463 11.9577382835093  5.77987337461182 11.8680133252243  6.0069647032967 11.8675648813736  Z M 9.4386589010989 6.7968860992033  L 9.44015876923077 6.7968860992033  C 9.66513872527472 6.7968860992033  9.88261934065934 6.88474076774725  10.0416051868132 7.04580768510989  L 11.1515062637363 8.13813408903846  L 12.2674068351648 7.04434343884616  C 12.4270210409456 6.8876846429303  12.6440186186689 6.79960407806024  12.8703531098901 6.79960407806024  C 13.0966876011113 6.79960407806024  13.3136851788346 6.8876846429303  13.4732993846154 7.04434343884616  C 13.8081037182273 7.37327555923492  13.8081037182273 7.90437786851234  13.4732993846154 8.2333099889011  L 11.7589521538462 9.92158391412088  C 11.5989952427259 10.0771688356732  11.3823991010303 10.1645275248819  11.1566005249809 10.1645275248819  C 10.9235196313719 10.1645275248819  10.7005802328934 10.0714604525706  10.5395608131868 9.90694147293956  L 9.42965971428572 8.81315080129121  L 8.31375914285714 9.90694147293956  C 8.15515262036918 10.0654343071789  7.93777785744171 10.1547882718682  7.71081287912088 10.1547882718682  C 7.48384790080005 10.1547882718682  7.26647313787258 10.0654343071789  7.10786661538462 9.90694147293956  L 5.99946538461539 8.81315080129121  L 4.88356481318681 9.9142626828022  C 4.72495829069886 10.0727555170415  4.50758352777138 10.1621094817308  4.28061854945055 10.1621094817308  C 4.05365357112972 10.1621094817308  3.83627880820225 10.0727555170415  3.67767228571429 9.9142626828022  L 1.97232424175824 8.2333099889011  C 1.80983294552308 8.0755578293417  1.71847013050178 7.86107114889826  1.71847013050178 7.63735280842644  C 1.71847013050178 7.17474161985507  2.10141044524656 6.79910151096138  2.57527050549451 6.7968860992033  C 2.80175032967033 6.7968860992033  3.01923094505494 6.88474076774725  3.17821679120879 7.04580768510989  L 4.28811789010989 8.13813408903846  L 5.40401843956044 7.04434343884616  C 5.5628298217663 6.88622149593542  5.78012795636545 6.79712576420842  6.00696471428572 6.79712576420842  C 6.23380147220598 6.79712576420842  6.45109960680513 6.88622149593542  6.60991098901099 7.04434343884615  L 7.71981208791209 8.13813408903846  L 8.83571263736264 7.04434343884616  C 8.99448309954062 6.88613343895491  9.21178637711413 6.79694922105994  9.4386589010989 6.7968860992033  Z " fill-rule="nonzero" fill="#02a7f0" stroke="none" transform="matrix(1 0 0 1 12 0 )" />
+  </g>
+</svg>
\ No newline at end of file