From 7ec7cea507f4434cd12d068da7ecc2af21c0c4e2 Mon Sep 17 00:00:00 2001 From: "978184212@qq.com" <978184212@qq.com> Date: Thu, 23 Jul 2026 10:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=8F=90?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=EF=BC=8C=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/service/service.js | 2 +- manifest.json | 2 +- packDetail/pages/Site/detail.vue | 3 - packDetail/pages/Site/index.vue | 12 - packDetail/pages/Site/sjdetail.vue | 15 - packDetail/pages/fwtz/add.vue | 5 - packDetail/pages/fwtz/detail.vue | 2 - packDetail/pages/fwtz/edit.vue | 5 - packDetail/pages/fwtz/index.vue | 19 - packDetail/pages/login/login.vue | 6 +- packDetail/pages/operations/list.vue | 6 - packDetail/pages/sjdyj/index.vue | 8 +- packDetail/pages/userzl/index.vue | 2 - packDetail/pages/vidio/detail.vue | 3 +- packDetail/pages/vidio/index.vue | 21 +- packDetail/pages/vidio/soilindex.vue | 4 +- packDetail/static/dls.jpg | Bin 62152 -> 65738 bytes packDetail1/pages/about/index.vue | 4 +- packDetail1/pages/device/index.vue | 12 - packDetail1/pages/device/index1.vue | 5 - packDetail1/pages/device/index2.vue | 9 +- packDetail1/pages/device/playback.vue | 31 -- packDetail1/pages/operations/list.vue | 6 - pages.json | 12 +- pages/index/index.vue | 8 +- pages/index/indexData.js | 2 +- pages/maps/index.vue | 618 ++++++++++++++++---------- pages/user/people.vue | 2 +- 28 files changed, 418 insertions(+), 406 deletions(-) diff --git a/common/service/service.js b/common/service/service.js index 00c54e7..2660df0 100644 --- a/common/service/service.js +++ b/common/service/service.js @@ -48,7 +48,7 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */ 'app-id' : uni.getAccountInfoSync().miniProgram.appId, "client-type" : "MA", 'third-session' : uni.getStorageSync('third_session')||'123', - 'X-Tenant-Id' : '1001' + 'X-Tenant-Id' : '1002' } /* if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行 diff --git a/manifest.json b/manifest.json index b8afb50..236dc4b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "武乡面源污染监测平台", + "name" : "吉县面源污染监测平台", "appid" : "__UNI__A58A5D7", "description" : "", "versionName" : "2.2.22", diff --git a/packDetail/pages/Site/detail.vue b/packDetail/pages/Site/detail.vue index e3029f6..a31947c 100644 --- a/packDetail/pages/Site/detail.vue +++ b/packDetail/pages/Site/detail.vue @@ -260,14 +260,12 @@ }, onLoad(options) { this.item = JSON.parse(decodeURIComponent(options.item)); - console.log("...........",this.item) uni.getSystemInfo({ success: res => { var pxToRpxScale = 750 / res.windowWidth var ktxStatusHeight = res.statusBarHeight * pxToRpxScale var navigationHeight = 44 * pxToRpxScale this.height = res.windowHeight * pxToRpxScale//将px 转换rpx - console.log(this.height,ktxStatusHeight,navigationHeight) this.scorllheight = this.height } }); @@ -328,7 +326,6 @@ }) }, tosjdetail(item,index){ - console.log(item,'gegwg') uni.navigateTo({ url:'/packDetail/pages/Site/sjdetail?item=' + encodeURIComponent(JSON.stringify(item)) + '&stationCode='+this.details.stationCode + '&stationName=' + this.details.stationName }) diff --git a/packDetail/pages/Site/index.vue b/packDetail/pages/Site/index.vue index 3a8f61c..d868239 100644 --- a/packDetail/pages/Site/index.vue +++ b/packDetail/pages/Site/index.vue @@ -96,7 +96,6 @@ var ktxStatusHeight = res.statusBarHeight * pxToRpxScale var navigationHeight = 44 * pxToRpxScale this.height = res.windowHeight * pxToRpxScale//将px 转换rpx - console.log(this.height,ktxStatusHeight,navigationHeight) this.scorllheight = this.height } }); @@ -144,27 +143,20 @@ this.List[i].survDataCount = (this.List[i].survDataCount /100000000).toFixed(1) + '亿' } } - console.log(this.List,'35415') if(res.data.data.total != 0){ this.allNum = Number(res.data.data.total)/Number(this.pageSize)+''; - console.log(this.allNum,'总页数') if(this.allNum.indexOf('.') == -1) { this.allNum = this.allNum; - console.log(this.allNum,'if') } else { this.allNum = parseInt(Number(this.allNum)+1); - console.log(this.allNum,'else') } - console.log(this.pageNo,this.allNum,'156156') if(this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus='nomore' - console.log(this.isLastpage,'true','nomore') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage,'false') } }else{ this.isLastpage = true; @@ -176,7 +168,6 @@ }) }, lower() { - console.log("最后一页了，取消下拉功能"); // 最后一页了，取消下拉功能 if (this.isLastpage) { return @@ -186,7 +177,6 @@ this.intervalId = setInterval(() => { num = num+1; },1000) - console.log(this.intervalId,num) this.pageNo = this.pageNo + 1; let params = {} params.pageNo = this.pageNo @@ -199,12 +189,10 @@ if(this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus='nomore' - console.log(this.isLastpage,'true') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage,'false') } }else{ this.isLastpage = true; diff --git a/packDetail/pages/Site/sjdetail.vue b/packDetail/pages/Site/sjdetail.vue index 1142585..7d55396 100644 --- a/packDetail/pages/Site/sjdetail.vue +++ b/packDetail/pages/Site/sjdetail.vue @@ -132,8 +132,6 @@ value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2), dataDateTime:data[i].dataDateTime }) - console.log(data[i].codelist, '数据') - console.log(data, '数据全部') } } } @@ -141,26 +139,19 @@ } // this.list = data this.list = this.list.concat(data) - // console.log(this.list, '数据all') if(res.data.data.total != 0){ this.allNum = Number(res.data.data.total)/Number(this.pageSize)+''; - console.log(this.allNum,'总页数') if(this.allNum.indexOf('.') == -1) { this.allNum = this.allNum; - console.log(this.allNum,'if') } else { this.allNum = parseInt(Number(this.allNum)+1); - console.log(this.allNum,'else') } - console.log(this.pageNo,this.allNum,'156156') if(this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus='nomore' - console.log(this.isLastpage,'true','nomore') } else { this.isLastpage = false; this.loadStatus = 'more' - console.log(this.isLastpage,'false') } }else{ this.isLastpage = true; @@ -169,7 +160,6 @@ }) }, lower() { - console.log("最后一页了，取消下拉功能"); // 最后一页了，取消下拉功能 if (this.isLastpage) { return @@ -179,7 +169,6 @@ this.intervalId = setInterval(() => { num = num+1; },1000) - console.log(this.intervalId,num) this.pageNo = this.pageNo + 1; let params = {} params.pollutionCode = this.details.code @@ -201,8 +190,6 @@ value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2), dataDateTime:data[i].dataDateTime }) - console.log(data[i].codelist, '数据') - console.log(data, '数据全部') } } } @@ -214,12 +201,10 @@ if(this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus='nomore' - console.log(this.isLastpage,'true') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage,'false') } }else{ this.isLastpage = true; diff --git a/packDetail/pages/fwtz/add.vue b/packDetail/pages/fwtz/add.vue index e17a940..c04e533 100644 --- a/packDetail/pages/fwtz/add.vue +++ b/packDetail/pages/fwtz/add.vue @@ -178,7 +178,6 @@ text:res.data.data[i].itemText, value:res.data.data[i].itemValue }) - console.log(this.hobby) } }) }, @@ -207,7 +206,6 @@ text:res.data.data[i].itemText, value:res.data.data[i].itemValue }) - console.log(this.hobby3) } }) }, @@ -217,17 +215,14 @@ }, // 选择养殖品种 change1(e){ - console.log(e) this.details.breedVariety = e.detail.value }, // 选择治污模式 change2(e){ - console.log(e) this.details.controlMode = e.detail.value }, // 选择利用模式 change3(e){ - console.log(e) this.details.useMode = e.detail.value }, // 提交 diff --git a/packDetail/pages/fwtz/detail.vue b/packDetail/pages/fwtz/detail.vue index 90dc195..e58e7f2 100644 --- a/packDetail/pages/fwtz/detail.vue +++ b/packDetail/pages/fwtz/detail.vue @@ -119,7 +119,6 @@ text:res.data.data[i].itemText, value:res.data.data[i].itemValue }) - console.log(this.hobby) } }) }, @@ -155,7 +154,6 @@ text:res.data.data[i].itemText, value:res.data.data[i].itemValue }) - console.log(this.hobby3) } for(var i=0;i { num = num+1; },1000) - console.log(this.intervalId,num) this.pageNo = this.pageNo + 1; let params = {} params.pageNo = this.pageNo @@ -266,12 +254,10 @@ if(this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus='nomore' - console.log(this.isLastpage,'true') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage,'false') } }else{ this.isLastpage = true; @@ -281,7 +267,6 @@ }) }, bindPickerChange: function(e) { - console.log('picker发送选择改变，携带值为', e.detail.value) this.index = e.detail.value this.breedVariety = this.arrays[this.index].value this.breedVariety1 = this.arrays[this.index].text @@ -312,12 +297,10 @@ }, // 操作 caozuo(item){ - console.log(item) var that = this uni.showActionSheet({ itemList: ['编辑', '删除'], success: function (res) { - console.log('选中了第' + (res.tapIndex + 1) + '个按钮'); if((res.tapIndex + 1) == 1){ uni.navigateTo({ url:'/packDetail/pages/fwtz/edit?item='+ encodeURIComponent(JSON.stringify(item)) @@ -328,8 +311,6 @@ content: '是否删除数据？', success: function (res) { if (res.confirm) { - console.log('用户点击确定'); - console.log(item.id,1) that.$http.delete(that.deleteUrl+'?id='+item.id).then(res =>{ if(res.data.code == 0){ uni.showToast({ diff --git a/packDetail/pages/login/login.vue b/packDetail/pages/login/login.vue index bb6b400..63ff5a7 100644 --- a/packDetail/pages/login/login.vue +++ b/packDetail/pages/login/login.vue @@ -35,7 +35,7 @@ - Copyright © 武乡县农业农村局 + Copyright © 吉县现代农业发展中心 G+) zos)#VG_#}I$FoStajSxdWp2IAd}pUY0sVN(#H0s;49I#l>*`T$IKS|;hVjdAywEFOKmNMFYmM|P!OAQ0KNc78 zlBhMa zM>$;r|LeZRX=3;GOCmqNeA4h+$@><(GwhH?dc%HFh4N~#|L@KpN`6&8py6*`0p4DI z01nebqFiDZ?sY>nQfFvoJ|tG;n4D~`y_^$!d3fcJbTWBI@wLNxLRCsj+@##4$n@f*l1d3Ei+1fh#I7>aXp`m z5f}^DHT6gFX=M+J<0#n&Z?h>tuf7`QdQMelfK;;ZJ<)*br?~Tc2Jffti8zCneqqH@ zDMMrny!d{t`q1d`)7ee<-SEgc0&_7dKr%L+86fNPzGgyc{50%!fcm{Nz6LxRtT$AT zLv1HSUjO@#t@?wJ3Ug54zehOxh)oQ>wveu%AS^W{{7D%a^<41foPG_L=vk#!rRgn( zGlWkIgUws<@!L+EFVWE`{6Zf?Rkj{7aYBEV{PN27^jtjw#ga5$MI6dCKBP_BUmw_J-`Ajkc`4+od2|Oe!}bTAt`?4 z7NF0vepd&JOdL~Rh%4u8ZoRE#CMy5X3%tg}JWigHk^*^L!<<|J&mny7S*5CIDrUUO zS#es~l~vr8W#xel>2N7SyjEx2`}^&|sZ!Ws!i`1cun_Rs9uvkY@F z(TeN5Eg<>tk-HPUnjZHi1&h6$0h-`&YQ3Hopwd~D4yIk$e0=D~YHvih3Z%__#N=P&>j8-;LQ6IGewf}*J?Nx%jagwj;1dD}JZWqsGTW2f_ zUeK%|>!UqhRIhyvD4N6>x)8B}jB4O3iCL8_%UE7w{8Rk6cP9{>RJ?=P!ts6}5uqZ$ z&MYy|u1G-jcz|(y7+C0y!KEKQUY^lz^TZ5s9hfV^ODDkDE;T+*zr0LV#-^P7R0ITO zymGz1is&qW16Fph3xaEQrcVs?2S~Nd1Ud z2mv^_FE|psf0Fy|@nxsLDE5h-*g2s&gMPXH{2k0ju<@;#t%+~<)*>Ta!piFYzFXk^ z+qL;m^UE$d*uk)oHgsi6l(_$A;#(r|3{qjDo?Y*SkCXW^t#2xVmt7+)g_?=kJ2cTd zc#ppUeK8l984b1*j}bvCl`ggG(V51N)fi|*^nA0jSljn~F(Li>HGAg3?Y0dTR^7DY zhWWZJ()J<3aNjo3fW9{j5fN2p``@?w)2eWJ=-(q;AjmmGLSM?*mlc^}iP-aH-j2T) zTmGt;nrcS+h>g^&rG_763-&ff>pp9gb&uhb&Kq9@eAA2269OIH=#K)=%txd`f!wIh ztfo_+;EV+Dc(sE*%OScR&3l6!!fC<~R$mRUokUtT5XMxC8d^FYAk_OM>TS~m!5W)8 z-8qMMvj9}W06L4M$1zkeZ6>MI)}Qkc}9cqo2MCWE>E~`;Tk;b;*0cNn{IP#VbaFFt^r^EGnLPJlXHK##v%e zghmJ|pRK(8Ps)bqMzJVxdc_Sn*wkYVCt~LLRQO-c3F)>q_Cb|7NUU7KRrD{A=#$;v za;HeQk5J75!-VhHw1qG|!o;^0qnW^#y^zuVM2Rff)PwN#?&|1ip9rSopVOjF2#;^e zm2)4YTDW0*{>JH`1J}=B-I>-L#{;8Am{i!0H*sHoOqcQdWx*_6pCE*@bq{NTsDD3l zpe9Z*Bh{e$X=f!VjuScW4;5E8sjIO@?ywyhoyICtSCb778Y24)GLd1bx{z`QejGd; znFZwJP{o=XgAK2a3gsdyab9!0Q_et_J|`Qwbk`%3gz&}ch4*6`o17AHA8W$gw*aH+ z;@U;rF19|7%IA9ppHgdf?&>@0kpZ$pAW+c8;-$BDcvF;eq%Ji)MJB$JMc}Hd3){7> zNb2`IDnUY!;DT9$IW2Kc*lf^1lIzqcqgk`D`buM$ zAtLJB+N2-k=g%`06XXQIa#^?J*&aJ=?<#&*TPuNBAkjx+!?AkxS)PG^ZTZe;ts%lz z?c=w3_CS)xcEyM4Hc5xGS%)+3qi1>Ml9c(-XUQWjuMSX)&fYb^X>f07cMWis^3Hom1MUHbE86By|9RNN}y zlgW)Wmp<8~dHl%i*rLBmd~vzGehO2fEMtO_w9;mD*qlp0y!TCS!_O(Ri$3!+3BEHG zJ0aZB3~=UVblrF8BLb3jL$fGJ%k*QHr3!bVpEtir0O8dQmJUFBTygHJy|z`qbVI`X}9 z2+1Ipv+wGktNSZ|xM>gXk2CP&q-#!uA3hrQ|M!R%r@6!fPFWZjdhme0GbV0k z_wfnpvM9*s;uChK=oF%mhSzk5n$?%vVhMNObKofMo<~umuWs+P2&I8;(ikTvH5XHl zFC0&C=w0{xbn?NiTT8e9YxtNbeOmm1{0mbK(B4;j!Bh9Y4ccW+!Pny_S2-;;AM?W= zavG#^8an^i9hmh$Wkv!=M?ZXs*ZpIiiVZQAkn<`DE!b(p|xUm1E?C;mx2#%8u96@U6jC zo2py1&bnci zs{8K(tc)B)QW_g^_(tD`286aSgKts1q|@3!crNhE;AT|A98U$<)QZgDK`WBeXQ=~x zs_5bEklq#ttwBbQ=3R9O@sw3?`{|v;-<5hcHH)*FDH3vxkq(rUJgl0KP?&8~ceW%$ z3Y4wc5r(%k(D4{>)=!mq3^eM`SqT%V6iB&_ws}7?k>jiF(i#viP!d35i02k(=sKVd+x~GcQO%CuWZg*E&k!_Ab;P4Gw)n)Kpv5H(owH);$Q0w0# zlH&pjejg@V+RRf=epr{RY;CGg`W!>{eky;w;eo2MqDhL^P(0a+?eY=gwBRw$q);RHUG2C7^EEV6-$b1iQu@>`88}&eW zo>LZ}pe+?_nB1gvC??6uOvz)Xbg_)5r_E}5Fg8xi*o@t`)$cz_)K`D+f9HFL(4W{B z{Bmu6y&mEQTI#RzDqkgT!K}-~!z-UT#8KCJSVjiTu*_X0KtI33w{ma@`&CGDsG^a= z?f0~wxZ`xGPj_O!@;d%S()JOl%|@kj=~6P~M9JWDX%1@g9TiuvR0Y5jK5}CTm=rJa zqk8oc!vgNh9g|bZxwpNJfQ%awKI|Sl=%8rh zeR5sbxzBl>=SwCf#QSXDWGv9q)^l@v^H@}!(eUS=6FZspGtD+zE9M`Y28mjd`DGBF zWUK}Kbmu`uY->n|{p2yyWmTh~F*2Y|VBKd*Ibt@slHAD$aQvKk_3R6&=u{2C^;P0> zV=<__=WYD&usGTkIo3&J1bdbtmSQu=%{k34te|P>9Tvwe_Es&q1N+y4Vr}Rj-t9NP z&l@zQ5p4{N%Dw}zJ;)ZrwTz+8@hBUg=uz^H8xL|$5uf4H$XzR~A_{Y+XNd047VUyE zHM$ua=RS4VQ%mWZjQlCfjnb*djLhR)5qyF@{qvRo$V7XLi31=#+17$Z}qDwrk$9 z!Tt?<*;w54Q&G5M_4CqI9_EA!e`Eu|MlBiUGjwwN!^0SE9SxQRt`w3ijfv`eSS>p+ zEPeTg+5~8S*xf%``&wls8^Ket%dzUsC$o`ehOP6}v4nz7+#5T7(;il;}yIJjAAtZjGfp?>aOB zBvJN66+-b6AiJqN@1KoyDl1DKfm;s8-~!{8Y=#moPtS{^$?u}R{vEK74~a?%I3b^; zB>VkNMn+SCqKzc-dJ2gHRHC?f4}WJM&OZC&8wC(219}Lw>VsNBEhg1{K332jih!{_i$F9Ao%#BA+UW**@kN|7cw{XG1Z*u?+8*Sc3Pt)LM0b zHN}sajV+Py8)R!lj! zo|pb6h=0iCTzKnR78Iow%1AnKiY@fH)~rm5A*)V*-*4at`ur#BdsNBP2ht0L#>Y${ zhRT06T(8z=aXbJ-{+cQttx**qaba${i|@8Wx5*(_+5n3bnB5~7O^}}(i6siY2xdB9 z^WWKa@V)+rmqoTu^H%?4Iglv?elCrYV$s51QEBCa$H#*=m z6gJy1pOFGcAixkd+u5T)5c}tJ7jX8z<5r3v@Jm-HJSvES@`FuBOQ)`c@>N7fH#A9$f41`zp%eJkS zWmbIo$70J169&3AD#H2$A))nF)pdWrBaN*!cZ+G;?9|HE+xe12o>tx%0h$1PL=v#y z_lg(42L~vReag*V;00{oPS0xJFBj$889~HBsOJJ;dsN=MwEAZj_wR=W(_6m0HO`PB zGPy^*{%wYLY4PXLkDC`Q9MRIYs6vI!dFK^7ihLI1RNn;NG|z`5l0m0`B5_;80I4ac zT64Ztb|HBo<)`gSG!J~xc+lp<$pd5ZVIH^l&+{g56>m=8&7*ic3lRlB_Sd@t+=~iS zoiFLEowFu=J%%1uHF#Fg?NAA*oTZQPyn-0fV=7daH4)3}fHx2qlYlU~TnOjaAZeCn z>%*=gQzGI@&~JRFA%iT2LN>iI{zuacW9jcw?m=yaw^V zEO@j%+$2zE8(8bh4qc@4>RJ}5A#pp3j%6RS`*3`KbCHa0Bhvud?Pvgk)4m1^VwJIWv{re=Y8S?RQ~s2#n1J z`GU#~2X=;Q(rDV7V+QePU8)Mww&~MPg{bNSE6S;)n-B*FCOKXn&fixtg{B>hPFn`# z7{Ay!pTB%hr*~NZ=8bd8KfD3{!G=|1v6KBXKl&8$5)y~KqXwR&=;prNhr*R)GL|lo z1&(*Ts3$fK{tKEKV4sBcHYBSqL9v~dS0E|d&qSxmaOkw()(h@2E8exQ&;M5xEMttfLHv_M@>AlOLi*iXb8p5otU2o=Yz4hv(NYI~!j$Di!9c+?F|J??d|4c&4jcdmKz zRf{48yC4H;@$=9OtQmkp(b`T@zI`rc3{{+H(CgFKd8K_I3SAE7?EL**A;8f)z2O@u zRyQss15GKGNQ|St4$Equ%)O+K=btQMdbyXO#aj}|OP7MdjH+CLpeYXR{avA`-yRkU zB2P!1pCz@$8t^?@?~|ivZQ7ud40oyC{oL*`zvX)X+fzok$Y-uzYNaJYgJ>^6pW7Fx zO}USuge%LH{j0_-J9*0pSY-OCBc`Mytoeh-+~Pz=k3Za#a@eTez-}?c&>y)|V~@Zz zK2!$^&LWKp0TUgG4-SM^a+Y{@u{*sf4dOf4So%PzVP&cAD(3x}tqb1;@5o`7>%lPC ztZS{q$(Bv%l-HbT!V;;`kxf!e6@jDUTEjf#qu%lzuR}@4TF!%38j5G2YBQ$9P=Q6UPrG~5)Kf3L znkRCJ4jsqO53oj4Qz?O9)Lm(agu(YivRLtUQJbM;SDIQH@f<Xj@mqYGa%p8U&7R5$JH_)d15$Ee#*dzbgOAtb$qXIbN?%J|yH8+}Nz3*n+W z!TRo*OKDc4Dpiul9swoEt6jeEqs_6tmKnb}=j&Uil*oFUv?dKJl$^ir$XTS%rDo*J`e)=+x3U> z!-`T( zWXapjTe|*{+-*pq)*Vd9?iai*j1#7XrfP^yO*g=1>uLq-Q1Mbok$U?JYz z>5Hm78xBw(vp;Jw^F$z&^6m9!PM%Q;>Yi#^PVT1aT4vHTV}n-rwA_k*LbFf<%Gq|I zfHwTr?{frves1$f_SI_r@+=xii7Q%`{bm}MLeaOk8{&R$dOfz_k$FM+4=)aby4!w| zW0iTW4DqG~TE-uimvT=jhU;t_5DTLZLn;%*p8K0gc7Imk0tb$WWwA|0?04%%*(5LU ztEu}GVPif+n|im0q?3A_Lsz(LY4W}A3GW`wqi@d=HB}P@Ch(n;^+0p8&t1**Fy~(mZUDaCLwBuTD%0kUyU5v7Nja#s*G@#TxKo!{z zapsGpbLL<|88SIsKC}qvM8(pfn{rl>z(`?AOqDXNP=2@4`XXKGko$M(_M~-EA1;Ym zt74`%AP0$_hCH4V##fxq{Hq5tbzBPz2NWmiX!elBlv=R*{;3PrCHeHx{Og%KuhNCS zzggtaMi>5(&YhI4X$ehMh*DIU{jSOOA++MIwZ{q{;+C)ooH6l+jCWsCjZYE(`**rdwh z<(ki_iQ5p8q}{~p`t9kC=u}tDLuD<0+`_`U1 zwc%t({BMr7IZf55J3~{D%HAvqe_lv>dLkuRoXF-DRAKj7s5p<@xH<>Zd3^%jSRI(-L5_aRcRmVcJO0va=cs@t4iq@!-weRS84j!{>- zNsyqks8&?8>r0Es{F`&yah#vYihK|OuB#py`@7N*LCOXhJ_s;K3wZsqU5ZckktO+C zM>p~6Uz@ny*(O+2Ed)N9NN@hoTit)iFUE}8Dj?ti=5_tth-#Sh*@jWhz3pTaWVm*@ z=Ai@sGUO5+xON&dTs87`aq2-8^`Gf21C<30x4Y1(b8$w!T~JIIPw^}pm!QPy-#*{d z)=Ouh3RP|mv&QrlBaLP%9{+Ue4dL}qv9U2ml>XOWMTH_~ZJF6Y zu`}FW{&Vl@XJNG161CJInE&qi|G*C5Ocbhj( z-2Xqs!;=ocF&iWEUsy!}#)FGxQ1A`v#Nnc6x8{FQ62URcyPX-+|MP<5Uzp_9|GrZW z2B0depD^XD-@MICqlVU~RAO&i;7?W!H-3KzoC!|vLZubVs0%$t{D;-%&7ZyZKCL&h zTWzYd#G6Y7w_0XrG;htI{ z)bf<-@rL+XozP=doDr^>ksF;cJ2e%+zx~oZGqsGo(okjp(n18cnZ31OK#W{EqdYPB zyc#+g`!0T1*tzz!PlMFPzHa72fDsSE+;$Ow_Y5Cw)I7wJ{dV(LEv|0~-CUSuZ}hi` zI3mH{mPoh%Ew>_0QQsj3x2>Dxfe2^-bCXRPh?Y~C-=nYG#c2Sd;F(yayp?k?ZF29A zsapY`tQx1^cSC)+$gl?u;-_hXmT7HUm!|7u3&uPZ-@Mcq$e)-=P{|c9*SOy{TW^Y^ zJ{t~XJYHMeu4pPDD7F+v=dI4TR5f-|Sh9JbO0Xoxd~Ix}@9r33Zs;UcdO?|8(v1g5 zSYyp5J!(da_0r73b2kgoY8$FvS^20-m!OiEJECZQ;kDUHKw(nt%!he@pX~eC?3pdF z==>lXW@QuFx9N8NRBD!!^kst%-yMtgrk(4#=9BpZdf}^Nkmx=P3&yz7M_7N_u1Ss> zY@S{oEn)CPVW&?ajWe!Slqf@F_K=PHIn`<{>QZAn25i9_Dv%cvb7b|I66InzB{n}}Bv;hC-EA$kF!DH2m64tfm8quM;ys2!lw z7z_Vuf6$z}Q$rib~(P3T2t2A z;n1lncUVR?#_-9;bLWakE;6!7V&WZ<`k~{&%oV@UmVF~|fJRn(;(K_wJoyOJP*v_2 zxz_@|-l0qpeb$}Gx@bE)v;}ZqFr-q$(0G+dELn*Q{O7Jq4c{(XdwUuRPz`oCm=BL| zfujfaX3lP2H~! zX%!4)%1&CaqY0`E+%*Df&j2lwDqu~Ppt_>Um45^77c!_H+TwU~`I?`z)INl>imr3G z@Q^940@P#&jPB8y9?twvy=WJh?=wRJx*~WVpR91=@AKDtx>c2keR&AtA6_x94Elt+ z<2<;86ok3ZIofrJ8kmClRJ;-RQX;IB84aFY7t^mMe|qq=GT(U00~^}?aJ1V-=y4#_ znXS`mpu>w#qvG&I&91zSWABaiQ=k-1yN%~%ki74b@NP2F_ z7gcg{&d9>Z+|tNgX0_)wz`&ovEkKgQ{Dqt&p&wttg!3c52C<aG zqwzBGx+91`NTr5>uw)rs6Ie=X84i-P$g7b$?|-_GES#h+0W zyzLjCAP5>$4I%9Vd7X~`T z1%vbDgE|#7@3|)|p8`O*-9K%ZUBb(McqePyu{R-U*YQn1Rsc;B?C4N_B7Wn|mYW_K z-t|if$Etk_eeigI?V#0Wsm{c3ndVo4*%>I+p2s2yupni|0Ol`aidR6<9u%6;l_MXL+IMtAqa@1O{(( zc_}ad8;$sf=M|hNd$WKHt15x;tn|cQj$?*`{W@kk?)!<#qGC(@ecWjSzWNILFze~Y zpGkHIO(@@@)c%f&-?k!Jls6hP6g$A<9ALKf2&2z#Hof?D$sIu8-w7FzzIiew}c49-B)SX(=v6OThc2ftrW`+pWuK{~%R1s=eq zh~SzH0d#%wajU>T__ag60N4rzYjTQ5a(aq-dWwXsHI}zn03~2)xk@=R02IvUBn%&f zSw@mkt;!YtDRo?AX@wiriPbhH`9hB-pQkFZJHDE;20l{V8!n4Ur?J>Uw8fu6-<7t} z+fNC@>vi=^+yDs4SF$+BYsYlhB%MEam0nlXrf{GEy3Mkps`}^cxH#(@h2ngQF%SAa zi!C9;Hdk3{-QxQ|6*{AG)~ENvmjSt1S-{%OF}Os`ZmPLd$?Dx03lKZ{Neitbb{yWe ziD!?^?Q_Gedte``o<@p@pfZN_Hxjf(V`fRKJSuVhaMqGEkx)gc6 zXS@rLL~7TW9{S83qv^b_fPrShV>s}97cdRG>i7+m5BxgPg6;=4GTjmNT=V%DeqQ6e zQ$SJBa>^hp&`9xTECq>lDBQVo=hnxNr%#zn908<=ok6+d{m73YUmxoM zdtcNvaO-n{xaliulhJT+0@Rheasb0c>8YMhKLH^?VIgt60l@%$&aWAuP`T z@g{RAXLuf&KRE?pbV-)L40R+7Fa2aM<;%F2zu6N8wd^qXJ0@?0Pg_c?vb}Sb6k$$h zmV-SDB5mgydvew6w{`u%r9El@4J=XM{co|**jm3bjEXJo8u~T{R!vUKKK1L(X{Jwh zGaP4rmSIB6HFxlW+g6`UA(jFD;HSp>xU`ZfLJgz6!Kc&nViJ+ym+3=%VNcf(V!10H zrMo|AJW=!xds;Bdu%WAQe@Y@tUB>`npV3^@AZ6H*{chlv zOw(%=fQ$b8n!`Ul@1kOha`HGzC=-#XCYGELLByurGWw%9G&=nxJK*tqHd@0>$kMv3 zpZM_mMvxIEYTJP z(gGo)Vny+_o>xG-U(~6VLGw&9IY5`oX{z2~lHu2YPDPIJdoBqfnyx|dK=!h>+duf| ze%x#$w{G2w$G@Y0Bk`!N(!&ccy$=NKX2Qt?SaM$!4Rl_Ipkpq2lNElaT?iA7BuwU*Q(>R|24mQW_nPm)pk-G*%)%8X@;w@Azs@ zy@M`NinUiAEevl&9O@Mp)d%Hp-=IH&k9Y*;=2R<1#jeR^#vJ|#?v&EM{*p5q@ z*WeiUPZ_t;cy`*U;6Uuj#Mb&%?1cN-VW^P4<^b0%9ewTa;Tl(Z!ru36&r&nCzZytA zWXl@*_-P)RP@>N8(ubGc#PLal7)mc@y*i$&P>qkQ`u9l~2?imi8>U$@Dn+RgGv3@w zS+5sAxFT$9Ftr)z;6H?&nxj*tWhAZYxz%p|@_1BPo~n0mL9Y07y_*3K5#^T>!qf7~ z46?MvM-+ExPsa0eYGLqttZE~v+D=1b$S<-dBqjJ&I4KROtSAh4_+l|21%9zsj$sY? z+Evh~Qg$|gR3an0?X&}@5^tIJNjNmgd6}#EVw0VxO)D=KU+Lr6Ji#r*L6U;<2Nfgx zW;@bCA(>|DQCQpUE?-9S@;tq_c|wH6A^NvUDYQ9DfxiI1EOV1md@^mlJF42@d2-t1 zN~*a8kBvD$0>Fa%95+oZ4sGlF`w8XwlK{HuhQFj2f3rTBq4pdcAuP|yfTgYf-IpC8JL8SiU#41GgMB2&4i5}fK@5Ir!b4Kw zGL{kiTt()(Z^K)@$?4posP>VG;8bVr5eVF3W(xB+k@a}R8PM*Rz^~Dg*9gK%-rt-y zu}=Jc010~AQ9ow^-$KCJj*sLW1JWLT?k+mAq)!{%BSOX-YFU1qM!JrZEx zS(WU^-L9|sHd1@oqfwFv9}Q-~;X4Jk3>hj&(^=%%2oHlxl@fyFvcwXl=BJDS`p z0tG)lSTbod7OvOdBs=dB(0`~dgZs6b4%|hv)2ezOw8 z%OBrSk|TQ!Af7&!a}rI5=PB6C0$C|kg%eo9(eXfNgjWFtwFGV8^l;=ILlWP^QT$`*fzMh7rF2q z)@C2W$fgWh)a2(1qsK7XyQ>DlT%fW*89gms{WMcULTN-;GbRk#!)-@V0Q<7D!=R3= z9pa+vl5KK*%Vt#-y>D1e>)hDvLS5n>5ZVdsq{7)vHdK|z-M6j=rHyI#*Gjg(`q+=E z>rSIYn|t^6(swy-Un7D*GABA=4^Lp?^t(f!uKyUW>9$+lWjsl1o9A1-9njTTUo+S{ zxb`lTq;X_)YsfyJWR=`N#!N73xkis)EKC&DoT0MA8hWk&%?672y9J8uzU>`SNAX0& zFt#ch*ire)Ya^{2^#sm+Yi3Gf4mFyyH$_Iss4vB(S@!U|0>O2c;}_@@r1^%$C&aOYQRp*dpmeqpE~7$N`cH$A@&b z(86D1=t28UidPEy_&PezZ#ILEpIKkAvew>@d~~z=0na@kcLTt0K#m4%7r=L%Fmr}b z>8K`+#fDSTtNrvT->2vP648^%qmsd0*dQW~D^js%Mg4w@4&PEK9MyfomO|P3>FyWC zW3drDb#jc=&&hDr=K&((7mDVEPvrJkSHri&p35h@akG&(t9~1Uc5)&kJfvQgkp1j? zlc`Mf^4QZVpTgR-Oy2!nDD41chDFpwJB5deu=7;F`QCBd&dn_B2wM;Zz1t~B*;?GdD!|l55 zns*kdxboI*$g>VyUORc1YHhDf@s?IoXjKnmN1ASw7dP3h)-l{hI3QquF@++H1gnmg zp7crHzJ9U~CBmAGktzxxUF4m!7rid_RF)R-t2%Z3%CaRFTR?S_{C@(fL*!{vgDFwU zQX#)c=g1U~qbJd-ewOT-#i`A$c9bd?L2Ij5Uu~qGOy}^{p~+Uks)1>Zx$!7v&}*f` z%i>BdGlR`BcChAjD2sRkebL$U(yWEi+_>(gRN$f)@2HLc^Rv{YS>s+bZSN?RcUJLL zugwyskje3v%&SVsemBSLGPEyXx4FN6YncDADRzbkOTCY@mKlqs_f)iC!MMj*$HRBs zH-l{gEiEPTPNKY()4my0`(Dvmh_1{!>?g5vzcyvd@>7m!GFcXQtR0?le>W~ga)oF) z5E0zC+BO`N@_t*k7S(o?E1D|irE2Qm;i9}>pI>|)-K9CWzbhmA~y+j_*xm5i)~ zw!ok#1w`LHBBJ(}wWODSd>eKY^?hJ%lTj~atT-T&cH1mu91hjy!rmz`ox3~g2* zJhZ>Ng_2!}Cvfs#t}C!%Ht>FDTAQ}feL#JnG3BS!fK-X4nq7PBa!<72yNg^H;_tWk zwd$~$&ct8lEhNN~HItCQATYwbxV66v8AQsY)m?+i+ibvS)C@1zP(>BgC>tKt?tbVD zLd5?xAu5}-;Mw{1L6M}@f&Na_yR_|ln&tI|sYJoU;Hb+W`ouynE%l=lPkD{Ooy3j( zx5C-edtS$_d}Q&p*Gz5h)bma}twDZ7Uh>~QB~TYPCoeAkmWHW-i&a5NX_TLZA&AK2 zdhEf*a&{B+1+)o=f;A!RQO_$t*rlT2xNbI9h;i8=Hv z%?fQ;hn3D7S1yM79vg(?@KOD!!brP?9lh31gH94zdsjD}{?bCF>XE7fOUygFclGOnhiQQH8%m9hFV3@*jR| z*mbS*9K^{H3^iOFb$N8N@=hUNZrby(rI(8xS`bfB4?-OPVZ*}I#ZK)A7b2h8V|NoU z==2P}mhTOg_g+KuiHQUsT3lOL<)6>hoB=M5@Iz}+Z@vAgw~LG0nP!x6qGl+W;R}<+ z!!u6@`0V1C$$Hz+Uq0B^Q@Zrty2yC4vmo@dS;_VpXvT)9^avC6;FZ;e6PY4JMJ4k7 zs`K{^apZX16qIPNW%jClm|t5sHlIRlr2V-3WPfKigp;S6=#m-{4%3x?fh!6uLw30X+xd5`2<=fn2#{ z5EiAYP*ArlPCN^mOmXwHq|Om)Wul$NIJnO{EdT}7#4Eqvmk>6OX!Jik!|A#lZ?ejj zl8d0J$bx7vC`>%c0knP}*w z`_o)hR>5$lyRtC#ZG~7jzPtHJHJse*TxteQhgyR>r}e0w^Pbsbc9B_7RHlu zt)(eL`h&CEcS~NHVsR&)RA#8CaIUNUj?}>Bi4GZ5sD4p$qX@aXZpXT1RCubaAcAZS zyN&Q$2Z@E*Tb;(ftu=64GIE-SOlHouy};DFf$N*#^Xv4P<5c_^c5tLKolTp15FZTv zegXHvfX7TPHK+TeBL~%PTtXZRJ#$((w>dbM)H<*ETLU{fpBp`M0M_oYN4MXibIhoB z_~82+k6L(w)%FRZ=CLxj8}|8boGwZ_YGbIu?K3$jrEN>P?sv*uGHydgwFs*+F3HkO z0$;i;J2&s=X-5>nGpVub@b`7mz2+?Nsj1kJBZ8vpNMWUXOv&$uDbl&2j z)Xt#0yx(}{`a7nm!qjwa3q6M>&LDta=%)Ob>Hj(>a(;Q~Z?E~j*MYl-k3UA!e|3CV z)7AU#DI?;~aN7c=U&@!A!PYLUz}!!r0x5R~)8clPOu6Cm=?io&u9r7%I6VG*?m`k>r zz1wMXIV_X;#?$7!jSdb@#3AD&=6q_Zo7_8Qtu6^HaNC_rYq&!$S20RAuQ1=ioJ&W| z&DCAOQGfl0CY7dIw#3WSALsV4Omy;-MB$c=kqJ?+7{)KG*D$=mH0x<8Vv`f=ju1JEtF4fKiN>=0?VRs-Od^O&Zy!?Hr_tJm!fMbty0Qc zO|>lKH$+9BgnO);!YpOD1~6=#mZg?7Hoz7^mg;4URrQJOBtDYzu(}9{CWg$hyxx_X?III zbbT9jF@pX+)H2x7-*@BZDWU_n3+Uz5C8DqeJTwmo6CVgWJ}{8rPp^CYqJXC2>9LRo z)!T@?t~<{tI6^DcZo#-J9#0xOBEuDh$$yRgl%zzAaellh^+a$|$N|J)ZM|>Wx#ci@ z0-&l>8hJBq4b%t-0Ju%xQ;vkv1fY($a3cG+d9L%UDCPQnl*LeIUg8xsgix= zqS1@f7H<*30A)z@;NtXL1_$VULsK%PBVQbqgH<}G!?62REF|(w7!Gz=$!?0kIg3~O zqj;0*dmLu?YGi|h<4)a>=1cQ~-rhW8`@HP_Me(yPZ1xkU2^gi1x4Q32pi*an4q1ua zUN_Lwb;`H(%nJN4-~x=ddga8({#`u=IA0fuEC2AO0rli>Wz=bwMO`gTK+qq={Bqwl zD=!Ol0m>?ji(h04-3$aDJIE;ha&a3!gHWA$U>&>~;U5gZ`;NFj&j#v9TQa_dF48BS zQZlQhR?eUPWMVzxJ5syml_(FWh;JKri4Cy@AM6&l2O4@LMY%3TY4S=O2aiuK?zcCz zYq4s}pcvQBl|z&VDCsoY7$yCTo&D;3%9rYxE_NmV;h`S>!>cr_kzx9y`wwsJSpTH| z+BEnosM$kSEu+>v$8}*nnep}&v0qP+u%dA4HJ_orBxfs$jbv=nRcw?+jaJp*wv6)7 zU+?acEEtYy%%ZsFAD)8aH5I0R+hoh)p3c~opIPhKX^k_ZYzjy=Rt4RAVDlT3O&SJ@ zebOww+<4cY!uN|a-*eA*Ggg@cJa!3>4$#W4cSs-(`uzv=)CUGvfN6kdZ#ynA%eI}Z zO^_cwDIud#l{~N}LD5nz;9a+5CgNM*)F{wl7kWSUS>7nGP(?)kg){7J#eFPkbmZvTl7un6Y%0|Gw`pN>ZOx;YDj>=$*zf-4eUd}GA0<2 zi}k0rw0agldK_Lx>Xq}!*DIsVt+hcl$7{C7$M5~01&E8J$v8`~P}+f--AwQ$L6a<< zZ2#k9T<1T$*Exn&YjeSSe8(4AzOcDQlC@g8==ku7UB>h>b9SXF#^fxID#}a$!yx?* zL*(?B(_h2k*o-~i3pyuf)2@cjF$$MYTa@Tm=mLwP5_1QOc#V{ibN<61LEnQ8r>mMz zGwljPHn2dpnL{f+XKvd75vPFU@eV5S4x~Bj_xgD4=7msN3-4qeGUp7>qrZo_OE&Ey zsl|1|e`*YsarGDcS;K3t8J$PPuh#)3YC}}lNm*frQYlW@VaogsmLk7xiGY8JirBJc z=vXPoQ(P0gm?l;w@(0?C-W8Hw_=hL35F81=oco$0a|XK(zBKy46vlpYFDH`Gf+nLB zLnLETq)zct+E{;L6Q9#ZEvDl*b-lKI6O_?4j&ZbX{~w-> zOJ}Jd)A?a1Z|&ce&Y+xscox&$mkyV}0=<-(T8o);sjutk>sWdo)d~+)HuX6dT@*%k zduql$R&p&t6C8G6BFD_Z_G#Etk7JqoxxFb!Q3XE(<4H&3>lth2erFE8#)mb@L{Xu# zEP{%R#-(5(dnVKQ))z=2gfN1EpK&YfJU#&CR5vELD+(;y-skBG%>F- zt=(XB(~bMYwB`2FPFziiB;}OUKeT4&Ynwu&cq9KHLTL0+9+&g@uhD z{!oZlAbe3;mX{xv^hD`3h|@lkM`?gO)k@fw6(~=;Rs)qkIYQ>#Z}NK2^e3U&FUmK6 zS6E{yRPQLhk^@XT%JJp2f#F_lz`%_Fa23!F`AVjPS6cq?o1)z7N=1U3=K7m_P8Mv> z>T|@}_J=rFt;TydiXp(Lv-ww>)V;T%U*Nu{)K<@dylaeqE%5tlx(N?MV#Rkpzm2$# z3}nZgk$>4o;(fbM9gZQEk*5P|<5N9_LZ2H@v;-&0OTd>#i?^)Ls zC#QE!P2r|Ud$huxuYbewT3?a4H|<%NNtI{#k2t`q_@7kQWP{#2O-8!``sC?#y3PA1 zIg0zOumAewq$R)FFzww@tP<>48@V)?5NY2s9Xy_QsY-`Qk9^Iq-g0H=)!PQ!G?-Mbz^h4(MT!W8plh#NFq(+CtKRm%uv8s~p zCur0%*6D>$)SU1R&P_A^v{;HX*25-mlXo^pIHv8Is)>JUoPLT9;m*=h|5@+THhtkQ zqFAz3Tn);lF{{|9s33}=WT7ETSDMM7COcrP87W%1w+P!c>|hyR^NC&u?GmLd&E+LG zZGneg!H{x9{Q{vKhV^43p7a~4g`}laVZ4j+2^j$Kkhk9{(-Xc70alZSVt%Nn}8R) z*+t;6VP<%xmV4?P#sb#DpM+euiAbaGUJZm-faozhWXMOiGLPWtF=7Oj8UOG+JE~wk zdngS%L}mLG)11?eDHah_x{oC(n)7#OY5MSM1=f{4`O?iHewLcHH$^NF8Ant!kK+nW z^!Jp{p8MSZMsT5d2kLvbi9=4T1)HBWi#~@a`5HRZ*T+?j~GFLabMm}>KSV>hsO zcL8aU0`*(>+ra)lX#7^Z1l|QL39@=Bcm>MDE&7?Zevs^BY0Zht7Tc}a$&LJp(x>f9 zo#{=!t*exV@3t!p0y)%G&o(t#EmV%w{mrpL4SKsbHE6y#EoMAyrM2&}(jaAS$-?onW{S8u|`Z>gbS{XF5c~l@M>g znL1fG40W3YOS_&&aZ-)HKZx)m=rlS2$p3Dl)MlQ5>kxHr*sN7RCiA;!iLVora?|yO ztDYIN`~Fi9L1{+DAe%v z5C8D4-9BF!bwd1Pn*dFij23I#(j0J*hh!VMWSH70y1PkwlMM7=-h=T!?fJMwMH?`E+4OHYyz!ZDnEH3Weu9m`3e_Ie8lI)cw{h%Xg1@1gyXD#n~7+K zv%8Z|0TnUCXm@|}lKWyb*yf%J&H&;8XNPzK_(7{@YnCe@-lH^_Y}sHYCIIgw=>c*h6@^O zW{jQa{atb!#pt79$oOF`isANBchDwHeqtQXT9`e_hc}qgB4>#CDAp^Uzh;tu%cG&~ z_YBtebO%MYdMu_8v~zi}4)~ui!}r#$tZnRwCCoS_sXA`VPmEL3vSV*yX6#ZU#-*xJ zTWGaLnUmITwXaT^kZAXYU`ib(8v38JhB@U1QSpb|ruOv~Kx)y^fbtJHXA=VjEi#DC z(p%uBM>EB%CJRjxT_o*(XvlH<@-F^E$dNLUf zjmV#Pme-~8W2%3={QsV}UvU76CeD2wa(4yoaKKQB0%+R0Y{$ofmx8i_ecd#?nS#w=VG)fbM9wNihHRB;0i`ovadqI z4_`<8R1EDcA=F5(A~&}0wMnt$7y3%9fiEO%eX7P5ciO!CS?zX&#H($JRZ21yXtAzu z_V<_E_3tZgKjNaP;AP!=?Mm14?WD2Ls2^pyU-LAGl_ivwrsq$o zXEt9Z78*8rxf|^%wbWsb4shBG2w|r-+Gj?~kB*?xtkHnZj*#h8PVCmHENj;Ze=zhL>qtV`QgX<^S;9 zxkF!M^_Od|8%JB+vvlnBemvZCLeeuCy`G#~XTPn6vQF1j3puKOgk8sjDl)gvH`uU5b;^&-LTj;g;zFcUWjbEhCxp?>{Gd z8~H$iFfJr4iI@hg@kIHaDU||HR{7r&jGVrr5ug!U2h^rO^qB#rDWG*L6(|qq;4BQk zQ9qHZS_8@|K*Rx9PCVDS8JBr_qpkT06l}<8I1oTLiZD_fsNCeK-n4BaxI>FK5KG<0=eY23(A^(H-vi;LsZ z(~G}MOnR`Ymj5x-)qUf5W6oAw{B2^A=!vc#e+8gN-zMp0jF4aFS8nXoeyy34sd(1SwC$0l94+8K6@E6npASUPw6yA@j%ZdTkTt`+y}e0WjwM70?vvk&_VSy(-Qh6Bd3YR-7Lf zTBa~DF%DeeH(?Eq7TB-y&2;@qPfL^HO1Py-RJnF}ez-nCdG6;gJfHJG2q4vc8d92& zr$-*AXq}Hw7Pk&G!}IZP?6pGj^8w98ZaH&#!VRFXl#@S6&M~~4kPKMNadNMt|F@7v z253lct}CC<5x5?5s*qcRj{&6(At2Y_xKE*{cSq@UIiPUlkW*$=%xC^Wp`edf{#5l2 z1%Xa@Bmr=H$bh&ClsGc$Msmi5>)d&EE4(!1QRFv$BS1T>4JQVo)AF51$)q?Wv^XKE z>~(d)7oMp6q-_PDU$1?O5XkWX;UyraOkgclASeHz0Ga?KS{w@cclCiDr|OMb56JQ9 zCnyxG9{~{nenY~Le1`DI&(Fzj1hkHT1_%&z6{IugbG(()(W7`q&I#;Rk9J;ZQ;Tp27eX%) zX@Y_>(!s${q=rr)6eWrX0s_(z5NS%28aiTtfCxwngoG9#NJ$_dgd%w3%>2IJ{pVZj z-Zgi=yS}w%|Fzf2bKdjpH~XCRuD$pByo~?xwBs+9Jt`$e@>iozaGAb+aPlqS#Hh}- zU-R=%$G&BZMDf%G zK|p`a??fj|H<9~%OXyHBZLcO-}dg9)!Fjgjr1|Z03LGoqZxPn zKZKctcw>G3Bw!MZ0b&27z;JWWzqrz~<%oZ>HJkoxaMZsB_S25Td z*r??f6~U>GCkNn`z7*N_RyKUNv452%CM)Pc@B7U#_oG*vQadBtKgkRwDZ8}Stodcl zj09gCi9yUaqbUKkLw#(OG0v(gmPU64I@~k$WuYWqsMXUr*qi>zpm`_0@=)8mpzy<;(EiSXk-lZoe4HpH)*3- z8()DB!MJ&RV;SpK0zIiejeXyLabB`g@UHM)!yy!}yVtgbO!EnsOs>pVznRPOGpQma z>T65FJBDc6-_TG`;T11QXx*9u=6bxd(gyDXzhbfLfU=plYHFz?3~faUrPxjlHZkTW zZIprme%v_%{F$?rO8WV85WGClZph|IFar)(^j?4^K-m=wSX8kCXm@T93 z)F;^Tuv~Vai`OiCYp+>dQzMgFDZ*9L_&O_RomiFEu*X~J*H8iUOPad##3U9tJ!H9> zR#P7})UqK|M!54gHNefg9t5?UHS@1S?_d{f4|X%Q^9|-h z*x74rm-kUr560->Z_*R4H3GBS>KICL8hr;dw$}!WfCohlfpa@xj!q?` z3|C-M!miW&Qpu-=_L0yT!er)64bgyK?609M@Yowf}~B`=?3Ny#bgFWR8%* zbXoLef2Si|UopF>{R7Mb4No(+x=1etyX)86OLc>MN$pd$d#hTokVrAi2_J=9RkgC5 z!n(ZiIGnS6Pu#hZ{J&-T{BD#@P{95RF}RzeGgyG8f9(8{%wKcsM_$H1?SIV!e7zz* zdV5X?M~|Ndf0WGy8j5T(TX%k12Dx4-Hf|d94Vd?WErjx=3#MeGu$YEQTvE%?$zFe0 zyIGOuvJZn8jEijOr&@<$Rk1f?^tt!4^-K_U19vTHxEn4oTT!1~3}I8MHvC0L@r_FI zj{2EF-^0m0LO1U;7|=7ZWm$8EUD3qt(EmGAY?$UAf-YDnCTwdl-U0VO3WlohDAHFK z0*lUQL=RZXAMpD2mAV}Iaq{F=Ax#R#gMVH`tJ$W*F-gi!Ets5)%UxDDfyiCW9}}3J zb(LVldO3Er@q~GOq9*dGfe1u-(w2Vu5<)=;zk@r(A7mO{=x{pUmMXTJqzlg5scs73 zX;2(}%YOLdTf;(lN^D^3q}T5@@4}t2Jr`O$WH>jbb+tvjcbnZ*B2m8D+9FJb3df&{ z0tWYuK;Kpb3*eNz+=42iR*FvN1Fe(OBALvCwRwcCgF!b>@=Cu`c^OdGhPzt9VD2Ej z%YOZV&_U(qL`%5F-sRN>&njB22Hm%{JX&#-UA4EEe*^keSHbLBuLIICMjHftcD~=w zd9BcWt}48>ht3N#8_Ox7U~GF8wj0SLwhTO%SG+GVFb z;V6-Lv~BP=>2Y{YqbqOauV_Vb*dwt0p*uQlTThLYyBRIqx{7|uk*%ko_AXK7>=xo7 zK(T$LZkqf>dVbIzUn8j2M>BSW%Xkzy0KJeapZ%Ppt~mU9wb}M~>^3}feQn(o9;llG{XC($ zoywDHnt0sNzp(6nCUjYuS1tZ^aSv*(=PTUj>#74e$PCSfYb<#kDW(&fxbY5RQ<6Tr z*Ln)nLCh4u);}-$RzCtUCuq#K)lh1=fedP`C!t9nCz+uKqR5FXmTV|X| z!Gw8DVH}X?><)Lh>ui5T#EIP;;i*0}Dv|?zXy1g{@&3+ato?s_(5;0KuCeT}$Nh($ ziL6M2T=g!r<4dmE)=^N)F}5(GNORg-$PJq9JxAW#1|Q~iEMwho-YI<^Li;Ph3*gi$ zM~JOvceAW=HFBx`qf-1JH$zBn527qJE;QNgIqE)k7uh?uG*nJ*EC!z%shIjvWkz@3 zCeF9Ky{>AHJ*A<>OcNRu13CJLd(OuY*PHA(kppaa{B{ZsPwxoOrkN! zK|BAUgqx7As6}FV_uV!F%BNp?j70!$urRPR2XKshK%l&%job)`ubuE*%@SvCs!f?h zT4Q7)iRf{8gWh*L6ZB6bj9$>w2ea(xgd7Ai-^+$jHP_*wV+T z7Gc*+-OEXpEIeYTim^twzU9fekt)x>A68>~d8ah#@J`)RtZmi!nS$M7JfnUN*fsWs znt0)K>=XYF9MRp|(_K@>S;sRlIx!!3vm~a}JENA+HYsD zUJeasWrcHlB)K}ZX6aZD3!Dj+SiOlwRPH|a22s*ud52#X)|?O8Y>sMHdT~6R_a|zd z`bsH1(qn|an8X)-$u}U%uu~I*< z94}nh@UkQ71Eb#i(&K{E2UE76zGNs|CEfhRfUIT|cFcb#Zz*RD=`%5f61#2AGnmon zUoQSoR%cgYH|$+7*dO?v$s2x{g@&JV%IbqU1c}^p*134TTS=v#W0sMKbDpIG?b{0e z2zOcZ4uV*y73~P0OOn#lSA3Axa7^I|&;9^eJD&qJ7;%&w`<$ zpVL=-zabQVU)^cU65`B?L}UTZOPtRA#logxH;~S>UqAB1&3nrm6tDik6QRbwSkE{L z{}rJ`w7u_1iEczE-S6@7j=zmd?0#+Lz7XWg(UDtm=#+C#C>LQ@4%0AFEfoNc6QmeuLk9R3}*tnUb+7*Ev4Y5m|+wom%WV zgc5w~q5E> z1!)J4v(#CX!e5ByK(KYdcc#~p?KHl2vbden^4+5w?U51NcM6x}!ivX}eC{7*Hm)w-zYbHq~XHyRe0^ zk5AnjQCBjNQu@{RH~I-Y+rudHYMfC}C*$~x!HOThGUp|l-^=dJT`_r5jG5&!>FIW> zdNa>-V?ZGpHyonicA}B2ujtl;i{e=Y;OR zcA4uR+6SK?%)` zH5<~Bpp$-cudi)r^AEAjuV%e^Rk!_sQhWk*W!)-B03Cm!_r;M(0;fCM-QsY0^`|0DwzyizX+o{>XS%#mAZswI;HvCO?5Y8DKrWpCv{xm798N}l9EM=v ztZq7%9fkP?Nr=E4QGo5X&MRCqT??L`B_oQ;t98nI{QN1DEy+;PO~z$lIOiHjkh;f- z!m;u}$L8c|DeEJwAK2)}CuV|qG&)((-uN`-Or{ew^Fn}6z<3}f_9&Ceb|=alw{@Z0 zx=*ycr7UF)1~2cBVUr%|!ep{nPU(MV(qnA>($0KmlH=!S{(?UGmWy=^-~1J{j=PcZ za?0i^(irp=H$G&phsTOPIZHq~yx2I}DN0$IK0ZLGEIMbON!q}#Wv8Mu)UuLTREBnO zv?%=&#G~gT0VbDR=eB!PIF!o5H_oZ)*~8@Ir|~U`pssp(t9znFj{sE_uCHcME8m&i zz?%^(+cQVEv^GwAsO6U1S;w4{J;?mPC)^xUZMh&v78bcF0=S=MC~S6v6R|0@zjjFU zv&seolpeJ`#^EhJ$*qwgRXax#KT#b>A~1LBUqDOH<(D<+G6?nOL3W3-Nqo03tiT6J z3{F$d8Ai}K22QFMkAh>SD14w7{Vrv~PNM@nxS^-H>X|Ri3NryL$1T7*1KQ`e8S;M5 zisrFbgdY*pO9}ek(s3gz?rmLba!=%@^-lmfL)TU*xsB4YN+Vr9eqIyP%fF4~J+%a1 zEK%5Ge4M(wkyT!yIjRIXj?0DWt7Bw)yWa-PE)_m zzwkW(s+FpR8&CJPMzOdz)n3?S;SfnLEn%KC_VNbbK`+>pU>eH?G4R0fcC=o5#_V3Y zvv7rKXfCX8_3IK3ISZx|Q@gyg(oM8Ixn3EEuGWT@W!_!B9ht3Wo`tOM4VxBVNN$pF z$R+_$o7*@%sYdhb@@tM{=PHEf5~Ckdx zv`TH*(k)ljOB%&D5_RKerg`W=$1YYw;^IHb1C8TLyMAImkn4wig5YJcPT&+{Y>GQZ zn~g^+)T^$H-2bxGaC=H|V4faI7*<_9-yrIA0j3d;$JPy;-{jiKQwY7BaCoOVo_{XB zJtmB6)gPE}VpT=F3ycnuzBqhRwY2i^I+`GG&sH%zZ^@5KRbt}g7<=;yUd(%~q||D0 ze!E1y^+^*^&HjL^(G!-0@1o`k_>vQW`QixQTEPl9L_PREieO_AbPvrjT1$LxFyXQE zs2_r6Ixkt0Qt6ZTO&}Ah^)sj7dQ1OzCR5eN$?e@xQH--Zl1&PnRy}#`=G#DX<-VSE z2{o4~7vwe1%D}ME2iLIz#QQ!)MGedfo(H#&zu#RqQ2|=-^TDbMFCt#`~A;O0cXb)Jl^^AdRfw!>s3Fv67REsO7y>6*i7yVWxUft>{)9W3$7(&VYP$se!=+HyNlk*KmA3(NhuTDjAnq0ao1 z4seq31l6$3c4Ruz zX8Up|X{Uf7FMyt$|7NjUCR7~=h&abm)AdZ6M5d3wdyYcy>r!b>bJkQT+-{}KWgEpD zY2JEE30>>u0#~VIinTvIxfhU^-d$A=w!2el-3HadTrN6Sa#_?bUeZ8W};>wcj zyWNHiTgQg_XLoQ^bz2?%-FBr?vfaAyQc9m?SE_$6$c)}LW0Xn`t#-W<5~?vZ11q&K z9cGAwYnY4xqj=~}u=opdKee!JIHSvLdkNjz^OLso6|H$=;dTQ)PDSJy`GAb&@isM$ zctV9JK%7!@7=!q#W^sJ4Gnfv4&Wl`H&9t@6+g?i<2I$h6CjFZyzCJM;6%k3Q!Qkbl8+3zfbw3|eh#x?4-5f+AebZ{wW%9(idjfLQReu4@y;W6M*>rZ>614oqhqRG3{h@z|y0+ZhdX&C>GV#VhA*H?E%x`>IX*l~PJ{l6Ay`5H!1e^_u z>n1pDa@m~{mbF3d7dY*^!wfg6z)#60v|E3AhE5E&xF z6Emec%mJ4!FF^4J*ns)^9AXRc93MG#pbtZXq1pY5yHcu@43MwkBJknw%x=}-ygw_kx<1=IxRcXqf@>vbXFO!T%ZY0)nr}L z8HH?+NSjEad7N1GZsv{m>i67H9!+J4@F!0-%7_zd8x*}M0sF>-)s=h z%-eqC(`z?u%6BPKvqgU35FWJw6~dZa>L!E0e9Ys5p;+rMCGYo;gb+t19@;3FlS_uk=`xYisVxPUZmJy8vQ; zX_1eiL@lEi80cm})D@tm!9|*ktXY(E#;?uV&=qW^a#ujzd~+G|l}`wiu`;4>wu-nV z-KAsA#{$`?U$Q*-eEPj7v({FJr|`B1Bf$U86!e|R2(!l)_MJ&-GPg7~0>@AWVCcA4 z?lFFdJz76X-sEJU;FIAMQs0>@Ilr15$w#C`?6xziTr6t|eT&#Rtne9W%c*fDOm`CK zGpe*TA2F>{&o(-aJsUj|w>V?JSU@J?f|9M~=H|xH_U&&4q@u6~i1hJT3mNMtEezE& z%vy+1l_c8Zpa|%$W%x;Fa@;5CB4Q;~xz)Ut*t<@Wa6_dF?bh&ln7a#TUb*bn*C&v= zoOw#uTHgVbhw9|&1fOTYSJy*k@D0WDvQ;Y2doM4g8gev(mvZ=DLQT7e$~QUoU+`z; zI(fDZtRBy-^&ILZvSzs*J|~ZdC4(?#Cdai=p-jxsUH~ryeXh56n&Z%SSJ6N|^*&J8L3xM8eWSK@rE?N#;zZ_1h;sngbBi|1%8u4!n# zqnx&~F^v~k)+4LmS_3?UVzev6>T{6Y zi#2misg69F$lO)psy82R0UXy^gzhMoyX#mp-REZVW&Y_e&G>(A{>KCVc;Fuo{D0{I I=y&{o0Lr+g^Z)<= diff --git a/packDetail1/pages/about/index.vue b/packDetail1/pages/about/index.vue index ead9644..99d3e5b 100644 --- a/packDetail1/pages/about/index.vue +++ b/packDetail1/pages/about/index.vue @@ -23,7 +23,7 @@ --> - Copyright © 武乡县农业农村局 + Copyright © 吉县现代农业发展中心 @@ -112,6 +112,6 @@ left: 50%; transform: translate(-50%); color: #999; - width: 52%; + width: 60%; } diff --git a/packDetail1/pages/device/index.vue b/packDetail1/pages/device/index.vue index 212fc87..c95b27e 100644 --- a/packDetail1/pages/device/index.vue +++ b/packDetail1/pages/device/index.vue @@ -71,7 +71,6 @@ var ktxStatusHeight = res.statusBarHeight * pxToRpxScale var navigationHeight = 44 * pxToRpxScale this.height = res.windowHeight * pxToRpxScale //将px 转换rpx - console.log(this.height, ktxStatusHeight, navigationHeight) this.scorllheight = this.height } }); @@ -85,7 +84,6 @@ var ktxStatusHeight = res.statusBarHeight * pxToRpxScale var navigationHeight = 44 * pxToRpxScale this.height = res.windowHeight * pxToRpxScale //将px 转换rpx - console.log(this.height, ktxStatusHeight, navigationHeight) this.scorllheight = this.height } }); @@ -112,24 +110,18 @@ this.List = this.List.concat(data) if (data.length != 0) { this.allNum = Number(data.length) / Number(this.pageSize) + ''; - console.log(this.allNum, '总页数') if (this.allNum.indexOf('.') == -1) { this.allNum = this.allNum; - console.log(this.allNum, 'if') } else { this.allNum = parseInt(Number(this.allNum) + 1); - console.log(this.allNum, 'else') } - console.log(this.pageNo, this.allNum, '156156') if (this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus = 'nomore' - console.log(this.isLastpage, 'true', 'nomore') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage, 'false') } } else { this.isLastpage = true; @@ -141,7 +133,6 @@ }) }, lower() { - console.log("最后一页了，取消下拉功能"); // 最后一页了，取消下拉功能 if (this.isLastpage) { return @@ -151,7 +142,6 @@ this.intervalId = setInterval(() => { num = num + 1; }, 1000) - console.log(this.intervalId, num) this.pageNo = this.pageNo + 1; let params = {} params.pageNo = this.pageNo @@ -166,12 +156,10 @@ if (this.pageNo == this.allNum) { this.isLastpage = true; this.loadStatus = 'nomore' - console.log(this.isLastpage, 'true') } else { this.isLastpage = false; // this.isLoadMore=true this.loadStatus = 'more' - console.log(this.isLastpage, 'false') } } else { this.isLastpage = true; diff --git a/packDetail1/pages/device/index1.vue b/packDetail1/pages/device/index1.vue index 7fc3a28..be64714 100644 --- a/packDetail1/pages/device/index1.vue +++ b/packDetail1/pages/device/index1.vue @@ -2326,7 +2326,6 @@ uni.sendSocketMessage({ data: JSON.stringify(param) }); - console.log('websocket发送给服务端的消息:', param); socketTask.close({ code: 1000, success: (res) => { @@ -2337,7 +2336,6 @@ // push pusherStateChange: function (e) { - console.log('>>> live-pusher onPushStateChange:', e.detail.code); const code = e.detail.code; let content = ''; switch (code) { @@ -2440,13 +2438,11 @@ }, stopPush() { - console.log('停止推流'); this.pushVideoContext.stop(); this.pushVideo=false }, startPush() { - console.log('开始推流，推流地址为:', this.pushUrl); uni.showToast({ title: '开始推流，推流地址为:' }); @@ -2458,7 +2454,6 @@ }, error(e) { - console.log('live-player', e); console.error('live-player error:', e.detail.errMsg); if (e.detail.errCode == 10001) { uni.showToast({ diff --git a/packDetail1/pages/device/index2.vue b/packDetail1/pages/device/index2.vue index 2520726..7dfc798 100644 --- a/packDetail1/pages/device/index2.vue +++ b/packDetail1/pages/device/index2.vue @@ -34,19 +34,13 @@ var player = null; export default { created() { - console.log(1111111111111111111111) // this.initPlayer() }, mounted() { - console.log('mounted...'); if (typeof window.EZUIKit !== 'undefined') { - - console.log('defined EZUIKit...'); this.initPlayer(); - } else { - - console.log('undefined EZUIKit...'); + } else { // 动态引入较大类库避免影响页面展示 const script = document.createElement('script') // view 层的页面运行在 www 根目录，其相对路径相对于 www 计算 @@ -62,7 +56,6 @@ windowWidth, windowHeight } = uni.getSystemInfoSync(); - console.log('initPlayer...'); return fetch('https://zy.sxzooh.com/zh-api/applet/ysyun/getYsToken') // .then(response => response.json()) diff --git a/packDetail1/pages/device/playback.vue b/packDetail1/pages/device/playback.vue index eba4ea6..833e025 100644 --- a/packDetail1/pages/device/playback.vue +++ b/packDetail1/pages/device/playback.vue @@ -226,10 +226,8 @@ export default { }, onLoad: function (options) { livePlayerContext = uni.createLivePlayerContext('livePlayer'); - console.log('获取参数', options); // 获取当前页面栈 const currentPage = getCurrentPages(); - console.log(currentPage.nv_length); // 获取url携带的参数 const { accessToken, deviceSerial, channelNo, date, switch1Checked } = options; @@ -238,7 +236,6 @@ export default { this.deviceSerial=deviceSerial, this.channelNo=channelNo, this.page=currentPage.nv_length - console.log(date); // 通过分享今日指定日期 if (date) { this.date=date, @@ -261,10 +258,8 @@ export default { */ onShareAppMessage: function (res) { const { accessToken, deviceSerial, channelNo, date, switch1Checked } = this; - console.log(switch1Checked); if (res.from === 'button') { // 来自页面内转发按钮 - console.log(res.target); this.panelStatus=0 } return { @@ -298,7 +293,6 @@ export default { // 获取存储类型 switch1Change: function (e) { - console.log('当前存储类型', e.detail); if (e.detail.value == false) { this.switchText='云存储', this.switch1Checked=false, @@ -327,10 +321,8 @@ export default { // 获取当前操作系统类型 uni.getSystemInfo({ success(res) { - console.log('当前操作系统：', res.system); const sys = res.system; type = sys.split(' '); - console.log(type); if (type[0] == 'iOS') { that.toDay=date.replace(/\-/g, '/') } else { @@ -351,7 +343,6 @@ export default { // 获取时间轴 getTimeLine: function () { const { recType, date, accessToken, deviceSerial, channelNo, timelineTimer, currentTimer } = this; - console.log('获取到的accessToken, accessToken', accessToken); var that = this; let currentDate = null; let timestampCurrent = null; @@ -381,7 +372,6 @@ export default { }, success: (res) => { - console.log('获取播放时间片段', res.data); if (res.data.code == 200) { if (res.data.data != null) { var result = res.data.data; @@ -408,7 +398,6 @@ export default { et: et }); } - console.log('availArr:', availArr); this.dateLine=availArr } else { this.dialogNodataTitle='暂无数据', @@ -447,7 +436,6 @@ export default { let stTime = e.detail.stTime; let etTime = e.detail.etTime; const { type, date, accessToken, deviceSerial, channelNo, videoSrc } = this; - console.log('当前播放时间', stTime, etTime); let startTime = null; let stopTime = null; startTime = date + ' ' + stTime; @@ -481,7 +469,6 @@ export default { }, success: (res) => { - console.log('获取到的播放地址：', res.data); if (res.data.code == '200' && res.data.data && res.data.data.url) { const playUrl = res.data.data.url; this.videoSrc=playUrl @@ -489,7 +476,6 @@ export default { this.handleStop(); // 开始播放 this.handlePlay(); - console.log('当前播放地址：', this.videoSrc); } else if (res.data.code == '20007') { debugger; this.dialogTitle='获取播放地址失败', @@ -519,7 +505,6 @@ export default { this.dialogTitle='获取播放地址失败', this.dialogContent=res.data.msg, this.dialogShow=true - console.log('获取rtmp播放地址失败'); } } }); @@ -549,7 +534,6 @@ export default { _this.fullScreen=true } }); - console.log('开启全屏'); }, unfullScreen() { @@ -559,7 +543,6 @@ export default { _this.fullScreen=false } }); - console.log('开启全屏'); }, ToggleObjectFit() { @@ -576,7 +559,6 @@ export default { }, handlePlay(callback) { - console.log('handelPlay', this.playVideo, this.isHD); this.checkNetWork(); livePlayerContext.play({ success: () => { @@ -594,7 +576,6 @@ export default { title: '网络异常', icon: 'none' }); - console.log('开始播放失败'); this.videoNetWorkError=true this.showVideoControls=false this.videoLoadingStatus=100 @@ -603,7 +584,6 @@ export default { }, handleStop(callback) { - console.log('stop'); const { list } = this; livePlayerContext.stop({ success: () => { @@ -622,7 +602,6 @@ export default { }, autoHideControl() { - console.log('showHdSelect', this.showHDSelect); const _this = this; clearTimeout(this.autoHideTimer); this.autoHideTimer = setTimeout(() => { @@ -640,7 +619,6 @@ export default { handleHD(e) { var showHDSelect = this.showHDSelect; - console.log('handleHD', showHDSelect); this.showHDSelect=!showHDSelect }, @@ -658,7 +636,6 @@ export default { }, statechange(e) { - console.log('live-player code:', e.detail.code, e.detail); const { code } = e.detail; let { videoLoadingStatus, list, panelStatus } = this; switch (code) { @@ -726,7 +703,6 @@ export default { }, error(e) { - console.log('live-player', e); console.error('live-player error:', e.detail.errMsg); if (e.detail.errCode == 10001) { uni.showToast({ @@ -738,7 +714,6 @@ export default { }, onVideoTap(e) { - console.log('点击视频'); const { deviceOffline, showVideoControls, panelStatus, videoNetWorkError } = this; if (deviceOffline || panelStatus === 4 || videoNetWorkError) { return false; @@ -755,10 +730,8 @@ export default { screenShoot(e) { const { playVideo, videoLoadingStatus } = this; if (!playVideo || videoLoadingStatus != 100) { - console.log('非播放状态下点击截图'); return false; } - console.log('开始截图'); // livePlayerContext.snapshot('raw'); let that = this; uni.getSetting({ @@ -786,13 +759,10 @@ export default { livePlayerContext .snapshot('raw') .then((data) => { - console.log('data', data); if (data) { - console.log(data); uni.saveImageToPhotosAlbum({ filePath: data.tempImagePath, success(res) { - console.log('保存成功', res); uni.showToast({ title: '截图已保存至手机相册', icon: 'none' @@ -850,7 +820,6 @@ export default { // 时间选择器 bindDateChange: function (e) { - console.log('picker发送选择改变，携带值为', e.detail.value); this.date=e.detail.value this.getTimeLine(); }, diff --git a/packDetail1/pages/operations/list.vue b/packDetail1/pages/operations/list.vue index acb3347..64c33ea 100644 --- a/packDetail1/pages/operations/list.vue +++ b/packDetail1/pages/operations/list.vue @@ -167,7 +167,6 @@ var ktxStatusHeight = res.statusBarHeight * pxToRpxScale var navigationHeight = 44 * pxToRpxScale this.height = res.windowHeight * pxToRpxScale//将px 转换rpx - console.log(this.height,ktxStatusHeight,navigationHeight) this.scorllheight = this.height - 120 } }); @@ -199,21 +198,17 @@ this.$set(item, 'checked', true) }) this.checkList = this.alllist - console.log(this.checkList,156) } }, checkSelectItem(e, item) { - console.log(item,156) // 如果是取消选中，就把checked置为false,如果是选中，就给添加一个checked=true if (item.checked == true) { this.$set(item, 'checked', false) this.checkList = this.checkList.filter(items => (items.value !== item.value)) - console.log(this.checkList,'true') } else { this.$set(item, 'checked', true) this.checkList.push(item) - console.log(this.checkList,'false') } // 过滤出数组中checked为true的项目，如果和原alllist长度相等，就全选显示 let newArr = this.alllist.filter(item => (item.checked == true)) @@ -222,7 +217,6 @@ } else { this.checkTrue = false; } - console.log(this.checkList,41561456) }, submit(){ uni.navigateBack({ diff --git a/pages.json b/pages.json index 01db334..6baf09a 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "武乡小流域面源污染监测", + "navigationBarTitleText": "吉县小流域面源污染监测", "navigationStyle": "custom" } }, @@ -156,7 +156,7 @@ { "path": "pages/operations/index", "style": { - "navigationBarTitleText": "站点运维", + "navigationBarTitleText": "运维记录", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } @@ -164,7 +164,7 @@ { "path": "pages/operations/detail", "style": { - "navigationBarTitleText": "站点运维详情", + "navigationBarTitleText": "运维记录详情", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } @@ -172,7 +172,7 @@ { "path": "pages/operations/add", "style": { - "navigationBarTitleText": "新增站点运维", + "navigationBarTitleText": "新增运维记录", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } @@ -180,7 +180,7 @@ { "path": "pages/operations/edit", "style": { - "navigationBarTitleText": "编辑站点运维", + "navigationBarTitleText": "编辑运维记录", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } @@ -212,7 +212,7 @@ { "path": "pages/sjdyj/index", "style": { - "navigationBarTitleText": "智能告警", + "navigationBarTitleText": "智能预警", "navigationStyle": "default", "navigationBarBackgroundColor":"#0F6EFF" } diff --git a/pages/index/index.vue b/pages/index/index.vue index f2916d5..a4311ee 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@