From bd14cecf0384239f68c16e6305d44915c85c85da Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Wed, 20 Nov 2024 13:24:31 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=9C=B0=E5=9B=BE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 12 ++- manifest.json | 1 + package.json | 3 +- pages.json | 20 +++++ pages/homeIndex/index.vue | 6 ++ pages/skInfo/detail/basicInfo.vue | 118 ++++++------------------------ pages/zhjs/index.vue | 59 +++++++++++++++ pages/zhjs/index1.vue | 62 ++++++++++++++++ pages/zhjs/subnvue/index.nvue | 50 +++++++++++++ static/tabs/add.png | Bin 3540 -> 1675 bytes static/tabs/dingwei.png | Bin 0 -> 1493 bytes 11 files changed, 233 insertions(+), 98 deletions(-) create mode 100644 pages/zhjs/index.vue create mode 100644 pages/zhjs/index1.vue create mode 100644 pages/zhjs/subnvue/index.nvue create mode 100644 static/tabs/dingwei.png diff --git a/App.vue b/App.vue index 7d3e0ab..43b5f72 100644 --- a/App.vue +++ b/App.vue @@ -12,8 +12,8 @@ console.log(token.secretKey,'App Launch') } else { uni.reLaunch({ - url: '/pages/login/login' - // url:'/pages/spjk/index' + // url: '/pages/login/login' + url:'/pages/zhjs/index' }) console.log(token.secretKey,'App Launch2') } @@ -34,6 +34,7 @@ @import "@/uni_modules/uview-ui/index.scss"; /* #ifndef APP-NVUE */ @import '@/static/customicons.css'; + @import 'ol/ol.css'; // 设置整个项目的背景色 page { // background: linear-gradient(-180deg, #64acf0 0%, #ffffff 62%,#EEF3F6 70%); @@ -106,4 +107,11 @@ // color: #3399ef; } } +// .amap-logo { +// display: none !important; +// } +// .amap-copyright { +// display: none !important; +// } + diff --git a/manifest.json b/manifest.json index 498a326..bb887b4 100644 --- a/manifest.json +++ b/manifest.json @@ -10,6 +10,7 @@ "usingComponents" : true, "nvueCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app", + "runmode":"liberate", "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : true, diff --git a/package.json b/package.json index 547af8c..1076917 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "echarts": "^4.9.0", "es6-promise": "^4.2.8", "flv.js": "^1.6.2", - "moment": "^2.30.1" + "moment": "^2.30.1", + "ol": "^10.2.1" } } diff --git a/pages.json b/pages.json index 2b6cb13..fbaaf0c 100644 --- a/pages.json +++ b/pages.json @@ -77,6 +77,26 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "pages/zhjs/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false, + "subNVues": [ + { + "id": "drawer", + "path": "pages/zhjs/subnvue/index.nvue", + "style": { + "position": "absolute", + "width": "100%", + "height": "100%" + } + } + ] + } + } }, { "path": "pages/mypage/compents/wtcl/index", diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 04b5a09..3ae5fd7 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -88,6 +88,12 @@ computed: { getNavList() { return [ + { + value: '综合监视', + key: 1, + icon: '../../static/tabs/yujing_icon@2x2.png', + url: '/pages/zhjs/index' + }, { value: '预警', key: 2, diff --git a/pages/skInfo/detail/basicInfo.vue b/pages/skInfo/detail/basicInfo.vue index 97123e7..ee386b9 100644 --- a/pages/skInfo/detail/basicInfo.vue +++ b/pages/skInfo/detail/basicInfo.vue @@ -1,22 +1,5 @@ \ No newline at end of file diff --git a/pages/zhjs/index.vue b/pages/zhjs/index.vue new file mode 100644 index 0000000..bfe7f0b --- /dev/null +++ b/pages/zhjs/index.vue @@ -0,0 +1,59 @@ + + + + \ No newline at end of file diff --git a/pages/zhjs/index1.vue b/pages/zhjs/index1.vue new file mode 100644 index 0000000..e80155d --- /dev/null +++ b/pages/zhjs/index1.vue @@ -0,0 +1,62 @@ + + + diff --git a/pages/zhjs/subnvue/index.nvue b/pages/zhjs/subnvue/index.nvue new file mode 100644 index 0000000..a3bb1f4 --- /dev/null +++ b/pages/zhjs/subnvue/index.nvue @@ -0,0 +1,50 @@ + + + + \ No newline at end of file diff --git a/static/tabs/add.png b/static/tabs/add.png index 3dc048afbe1efde152e23b3558ea4ff7fa94f190..036e72db059c83dace78df0ba1a8dbd9383882fa 100644 GIT binary patch literal 1675 zcmV;626Xv}P)Px*MM*?KRCr$Pn_Y|(RTRhnXWGszl8EsmqT5b)b$2`En->kl2Ngt7L5LqQK50Nq zAQCV_&=>JVh!`OlNJNM}5hEB-R1`sdFc5rU0im-W%67V|7|@6bvYobbOj|c7>~`** zk1iXS*ZV*JbM9}>+`YXsOSsA}y2|H|YXGiwz*SD5ZjZo6KxAq{n^A((2!$HK)Ch26 zl|S`?xDO8ZMWFN@$>k3`1(fP>Z$bso)q?9wwmOS|ISf1lASyViA_3bO*b`CheXZU2 zOE6Aa77BpwggT)}v;^QM0o){A)&B#22WUr>c~eWy{?Vt`W#NGWFp~|;ECDbo z;9@U;u?dQ@*~s>v3d%b$02y6fO+<^qd`nQp4eCR5hM6~~Eqiqkc>)1o>gwkJ9uA@) z36C!f%YH;cKR8c624=ICLJ8jke6t@P@3C|i5!_>(%6EA6@Z15Ndcz$KoS(cV4l+)G za%Y>>|FaiQPXKapj5@EV=K#dKBn=^^Fxs)lBzkc{*4q<+jIQn^;BnbxVd@$9IBnTa z$mWm+U?$XcAiOM_s4jZOTSm@aA(KlAK&P%f>VWsiB&fGm0nKT%@}G(3l>%Vu>Zbta zh?)%bO_S%S>oJMo3elZD&x_UyzaJsF8(4DbD5TL)X3R2yT~1YuAT9D z;E^*dTlX>%Q&%kj2`{nL7&>cM`I<*`0sz!J0M&aD_`$GjPpi7AtA_#HZQ0ZP0`R{LCR%A^^Xp_LV{~Usk64BievB#X{)ehu<2@yg&0}(ev!SQl?A7b$S%Hsi=iRwZd7mTkdBcN1bOc^KeGF1pb zIa@|o-zVVNAPNlIgMkmymi?Sa9$^4xvf)0k^NonFl`l0P*)xC zLL*z)CX-VdKm|fV+X~_ZGKoUhGHo+*`GvB1JOMb-G~^yuYSG& zR5~FUdz+brPJ6u;IaC}GuTNzQFZuEH4WQZy>J9+XA1C-J9KcS)vdiBg`nm!EP_7`O z$MzBE0bkV!1~d5Uv{jfTD6c6C3_u+_A&@&iKqXKB)jdLppU`;t1jemP0tZli9D;hC zcCmbs*IaIs9c(-l06{|tYx3nfLjzDY@6@#y9q>jkcV-|)0WEE_^6&WZs1+M3fa*R$ zo9!@fB%noR5)5=JL`zfI{9c(jS#9V5$^~`DwU#3BMi6ET70B2dWm?+Oo9`CV`w-Oy zz(9Q+y1I&iRT%nh&p86trYw7{k2y(&))hcyag3`IiLeS(`4^i1F7w-&u{PanAD5be zPjTG=4Ah&6NAD$~%2t+{ccgoZ-}#)2r|@9|;HlaWg02Aw0qTgdyw(9D>UM=t>_2lY V@=)ZfLjwQ+002ovPDHLkV1mR*{>=aY literal 3540 zcmV;_4J-1AP) z3(!_Y8OQ%YBq8&qLZGRji5f3Xfgp?ssD)fcq!=KIP%#NmGX<4QA&HO_SJRqp*7h*xdwJh?pFL;KvwJQ(^PdmqJ!j9e&+qKH z?0NRtPY7hL91frapi}7YQ2;&-phcNJ31EMj_No8B0bsrQE44LCj>-b~&H#D=_=@`X z2?-r%k2(RK1F#Ih3jlT}bgaZn8o{3d;4A>$0h|Ni7>BkzrA`2;r4H>dE@=UO1b|@x zh5{JifjyPV%K#Pwco@K2{+ZXf_zwPT1zYNK9@s-EAB9eU#l9NpEBKKBE&|Zs16$&h zwEz|Xco4upd@{@@@O1z#R=~S?V2{nRHFN^}#S4psdo>ZjGy!Z7fXKM^3t)}_PIm2g z*FC-;fXV80EQzuOz$*a$1YoavM-S^G_1@ny^jGRs^=jBDA-lE%xD~)%3DvJHuE4ic zz$aO(a~ptF09Gr|68QTu>--deF6tzZuaP|gbhKnI)a&4M0Lv}bNh=O6GhY?JOBOEa ze-*%e0=QHFB}V&?6Tol*%n(3>rCZY-0%*a>fgAeNm=5~80OqNar>TRJwvu`YV7dTa zjoG$m1kgEa;7=03BQcz^L;xcNQ0EEkYU(e5dj#-dj1zlAR=^KYm*psqSSWzLp2M!B zP6D`70J|c#dve;rPm9=ac{x8bg}}>oq5y6Zz|IIh_=NxtOC$LEBQ*ADb-7GC@N#t& z!2AgQSRsHmX#!tw*ud=qn3zG}787jS^5KFm!o;KkM`qOadJeP}i{>_Va; z^9yL!bS=^6ze@`I@#@Ud8Sr8XzMH2_^N8>#B>{de@!;nbpsY&{*!-E``yB!})h756 zMCgeJ5ad{ci45+y1-=zAp6s^;oWykt5&mEs;AasIBtN=zDZsF31%b!&I$Lyc^(7Uf z-b@p#Jq5sz6N&)0QJSlH^MTr{zj7AtMgSYs-$1)OZp$D5j}x{V2Vid1Uo~gOZG^L{ zK@IBo)-#S(G55=em&dSPRiWT#c-rglA++J8T6NT_{Ad;Kt2@9Dj~pVOey#J4TjQAwq-2(@V zQiDcG0uO7S3K=`Xal7SAqP0ot4UalEZ#9v+qFq3f9flQX^Sjn(6@4%l=*v2R5L74&IHO)3$;5TS~Hv+G# z%vRAYJF?MJ@N!Y22Q=GA@JBM(qU)rs*g;{{ zUV?8LbpM!@#Vvyg`~RN7j;LiNfSsCsDQ%2fD6Ecaq88xOmF)}$chLO)ZvcxJ?1)od z(Cn*gqm3fx1bnEer!^J)UIv5PXnuc&!G^eHm1cik8*P<+ntDD<1+S~fM$tKC3xf@D zi_S(a@VbubRgZ70`8^BZhU^_;SqQ}#U&PI;QJZysZ;U0fBgAH+uZZTvo@YXK%9Iqg{RhFAGe%g#$bZg{t ztR#J;S{k)h`MAf+`_8+X4NpqmUMwMO<1_efgbu>-t%1VoZ^38TO%^JPTecC#<9!BC zSrL0FgB=uBo2cMFZ^0l+c}%m7{JJ%k$rh7R2Vjh5`$Z~XBk7_8FR$(&_|)TN`2%4a zAHh!~tTkWHWQ(qoe#|-mzge>}7x;CANS3ai!I!xJClI!yoYXdoj#VS@x*jh}ZzjX% z5VpCJDX4)`rl?DOtumV_Zm}tW)Bjnk*z7t&T=)+dW7a7%X;w1YQ%(1JHj}0g!5%q1 zt^H9I`X=uqn1IZm6(MaeTKnCH$>^5N8#gP*F|VNcw(&J0DJEql8I=mUthanF{0 zLSxVJVB7Fc{Rs^j$k+&z`SDLAwcK_EjW@81bAEg)LIS6Qi$jHXtW&+Z){b{GHbm-j z11E1(iHnl5rLCHaPql}8T^`D0(}QdCm+!2*RBU#T*vDkuRpChvoHfio0wERLj__JR z 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 literal 0 HcmV?d00001