From 056609e0187d58c5bdb82559b674bdfd01319301 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 7 May 2024 11:30:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B7=A6=E4=BE=A7=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/bianjieruqin.vue | 116 +++++++++++++++------- 1 file changed, 80 insertions(+), 36 deletions(-) diff --git a/src/views/map/components/bianjieruqin.vue b/src/views/map/components/bianjieruqin.vue index 8fac441..687ef9e 100644 --- a/src/views/map/components/bianjieruqin.vue +++ b/src/views/map/components/bianjieruqin.vue @@ -1,7 +1,7 @@ @@ -79,17 +78,25 @@ export default { { lable: '视频总数', count: 0 + }, + { + lable: '在线数量', + count: 0 + }, + { + lable: '离线数量', + count: 0 } ], block2OptionsList: [ { - img: require('../../../assets/map/bianjie/img1.png'), - label: '码头', + img: require('../../../assets/map/gangkou_index/point/ico15.png'), + label: '重点工程总数', count: 0 }, { - img: require('../../../assets/map/bianjie/img2.png'), - label: '油罐区域', + img: require('../../../assets/map/gangkou_index/point/ico30.png'), + label: '重点工程开工数量', count: 0 } ], @@ -163,33 +170,70 @@ export default { this.initgetTable() }, methods: { + // 初始化总摄像头数 + // initCount() { + // requestFN( + // '/map/mapPlatformelectronic/listAll', + // { + // CORPINFO_ID: this.corpInfoId, + // AREA: this.area + // } + // ).then((data) => { + // this.block1OptionsList[0].count = data.allForMap + // }) + // }, // 初始化总摄像头数 initCount() { requestFN( - '/map/mapPlatformelectronic/listAll', + '/map/keyProject/listAllLocation', { CORPINFO_ID: this.corpInfoId, - AREA: this.area + AREA: this.area, + TYPE: 'VIDEO', + GANGKOU: this.gangkou } ).then((data) => { - this.block1OptionsList[0].count = data.allForMap + this.block1OptionsList[0].count = data.varList.length + data.varList.forEach((item) => { + if (item.ONLINE_STATUS === '0') { + this.block1OptionsList[1].count++ + } else { + this.block1OptionsList[2].count++ + } + }) }) }, + // 初始化港口摄像头数 + // initgetTable() { + // requestFN( + // '/map/mapPlatformelectronic/listAllByArea', + // { + // CORPINFO_ID: this.corpInfoId, + // AREA: this.area + // } + // ).then((data) => { + // data.varList.forEach(item => { + // if (item.SUOSHUQUYU === '2') { + // this.block2OptionsList[0].count = item.co + // } else if (item.SUOSHUQUYU === '1') { + // this.block2OptionsList[1].count = item.co + // } + // }) + // }) + // }, // 初始化港口摄像头数 initgetTable() { requestFN( - '/map/mapPlatformelectronic/listAllByArea', + '/outsourced/listForCount', { - CORPINFO_ID: this.corpInfoId, - AREA: this.area + CORPINFO_ID: this.corpInfoId } ).then((data) => { + this.block2OptionsList[0].count = data.varList.length data.varList.forEach(item => { - if (item.SUOSHUQUYU === '2') { - this.block2OptionsList[0].count = item.co - } else if (item.SUOSHUQUYU === '1') { - this.block2OptionsList[1].count = item.co + if (item.STATE == 1) { + this.block2OptionsList[1].count++ } }) }) From 4562798120d960048391489d33a3144e214f6a06 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 7 May 2024 13:37:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=82=B9=E4=BD=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/gangkou_index/point/ico31_offline.png | Bin 0 -> 1890 bytes .../map/gangkou_index/point/ico31_online.png | Bin 0 -> 2093 bytes src/views/map/index.vue | 8 ++++++++ src/views/map/js/dragentity.js | 6 +++++- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/assets/map/gangkou_index/point/ico31_offline.png create mode 100644 src/assets/map/gangkou_index/point/ico31_online.png diff --git a/src/assets/map/gangkou_index/point/ico31_offline.png b/src/assets/map/gangkou_index/point/ico31_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..ca6bed650b2e5cde92608c449cdc5e68cd390b1f GIT binary patch literal 1890 zcmV-o2c7tdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2KPxsK~z{rrB~Z; z6lE0Ox$W%i{n9H-r7h3`B`sA@F2;x5+jKZB)*vNto{l5fQhdr#KZ?pG|_;F zL?ejYp;`nf1(s5JgO+Z)+nw$1&g@(~=i5Eo>0~Jw&*Zn?`EKX;o%3Cn^ZZBQBCXU1 z)5pOnc0ITo)s+>;#6&_w1Ty3#Boa)$RXEAX z7R@V>7ON;#p(8PMKmtmMh)4)dGP$Z#%IrjC(f4wD^x3sBWoJ+p)=#P04~GXI9)`L+ zpio5#iG84uXEbsmsYih6GROkw-`N)F*_7~aZ47!hgUi^C3AnBwx;XxBUboVaRRL@O zNE`$O$*?iOX&49Q1S{t_PT9ID)ZN$Q- zKpu&spdc9;R;sDLsuM8p>uK<}_qT?&wMXS%pTLKq%tM4GOsQ#^9)Xu&&Vu#CQyhlP!DS&zSY}Tg`V$>D}4cpZ-la%5GkT;6+IRd2)yVKId6?v z)vf8zE{=Z$>Kq^gSU}=7P|zC;d8mqTOTgQ@Yjt=>XH3}^Q-rp~OPpMa?RO1SGjq_2Tpk7&> zbh&PWJ#fg>Jjt-wT&eNc%xy%_EBL+{${bZSD{TPzQg>V!kV91SD@lb60Ur=rmH~TP zhn$6W&@j7?g-9gQd2nm|&?_CW0|7}?PmkrV_B6`9ut<20!(ddzO-gxZS|MXTGM%kY z2cf}bmz zMMdJKR|UnFAnc7{S;(FlTRgw9(Ypl}iD25WNB|g89?s%y(O$SZoxgKwGIv`RZLY6b z>F8|^t%)n%2*=rcK{xWFS^ck5qxtW%nsvLcCDaAGWoE8u%n~u4(QG2`Wy%jaqf#Iw zb8ra>Yo`~>m*)!RL^34y;K+5;D%{KHH!e)%FBc6%T^Ezux3tJTO#!|E_9>iHuwdbg zI6ay>cH~y(r{Q$zX0~LecXuXsb;Nvc7WDGKy^J;jRP4xPrwj<2Hkj{gFem2ltbTOx zVd-Wnqur+R@}AD%JIRpHE{mQ3hJU_jj$WTBorx=aGv3RF$<0jV zv=KNq%Zelz8=C^%0k6<8vsn6dWWGX-w^ITXy8P)*c0L3USkGQ33BM41zd!bQv23R& zbLGne4~hej;sr14=?uKk-|F8FxY@5{H((H zI%E$uAY6d;aQ5ev`rWOx_D@c;@N&n8TwyY2-0yGk?G$*p?a&$sd%459K$$D(CsK17 z-canZhYtWeubpqMdSFMZ3%E82&T~^;=Vg+?clN7%;O?wr8*J{`P2O|Ur8JTdQwWl7M#2Af5{3_ caf!$N7i7d8Bk0n7kpKVy07*qoM6N<$f;X3hJ^%m! literal 0 HcmV?d00001 diff --git a/src/assets/map/gangkou_index/point/ico31_online.png b/src/assets/map/gangkou_index/point/ico31_online.png new file mode 100644 index 0000000000000000000000000000000000000000..a7e322297e2894f477899aebd7eb6c61754bfa74 GIT binary patch literal 2093 zcmV+|2-5e7P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2f|52K~z{rrB{1Q zTvZysk9oliGfWv6ULBwmC@_VJ1^N&wePl~oCE9;{M60RE+SOz?8aMloFs+_xgQj?!nvZw5#z;e)s#% zIrp63`M&#|$7Pw{DBQ9~X&=X)=+D0Cn?C_+u9Q-PAxzUV0>N~nMnNU~|jC=u0kKrInMuYeLGupbREk|3D? zh$|oy;8{l<4oaaO90xQgFak_~43##gK_-B{gMH|vs8c9pQs^-@+{rWQm3ks*X zd~EB=+VxEpE6W$>x_KREkkK#jQxqj(^V9D4iHA-Y%q|F4otrh z{azGUHf?CGEPbGDdE;HxMRiuQ$%+FL0zh2wgNG4Dr^{h@-a-~Dw)YN>e6w@cfj#ib z3?KjqA#olUlrUYwm>ZTA6+g83uBN8il6r^ToC|eiKuU;^WQmDIuQN$0%INfq7^B{q zYJ<;?JWGMK!j)U__?Ej@H!m+~EOy!!Qz8^CX{w%M z4xjQ}KXlSF_O~6IDr%N84s5`-Y@0dXU6EHXcy$uLFUg}@h+PHtyd51)ZOv|1tIKI$ z24i8Clirj7fub&xI(Yp1^S+?ZKgS;F8k(wJ>T-}ac%W`?si_0vQ81C1$8}r)M%Js( zG~K^z=lyTgRTQqWSu%1VKUnNRIx8TesU!7R2j8QP!6%B{Pe-CDZ1z@AC!Q_ZA( zaY0Tc&vRt016X{JrF8n@R98X_GYJuvn$k(#nH(u<;6u@9O7H@0qbCD-g*iksLKTKSOAn!Bss|>#ULXj#+lmk zY^PE!6Sonty_ueStLyWrnV3H&Ohae!=gt7M2^51)h-xZW#HA%m0<7sUBZ4D|B#bA; z8Bvn(fFQ&1&dR1G`**MZ`=7S0c_Q0t5550c-^C5hg>@_|aU74ye(Nr@U~2)5=$$MJ z5cVk8BIKDK^2Es8@J?Sladza$M~AMShMg?}uSfZLbB(ioZ9$zai>awXYYiky`^BaQJ-|QHY_iD?ZeI!198;u6pwsu9e?ayz1eRNZEewERX$Y6=rEPS&#BuWGb@jS;Wa)`-;!&5UK zAMX9(+n%dqRb}~^4{j={yt~HW%FdFl3`{Z-=VrgZ=sO#V#BrY{$08ErA;DeuMxr*0 z-d9~_ZnavZTxX6c@WG)=r`sBHR>)GAPe76+#aWUhyw1k>riI`aCoc{C_sF>`mQ0!5 zvaYmjb4z_maej`CWfNR56bknYPMv>m-=$B-Cz4mTwAEK8li`W$-p~{!#yuLdo9Q0# zk2ksmz~{Xm%Nh^|ISA?u3hOa=?DZT&-D!WegLXCZXS3a zBE%r_b8q#$yZbLI=LUuY*N&YT9}UkZbW^jjnq)$`k{x5IhN%dl)D zNn{{eBWL<1`rBJeTC;5?drf(+EpL%U;22h9IF8X9bYyAhbS%ATN_Z^hfI$y`JRT8f ztAXw0RB;trvj6qUJ^z@CB>V$Iv)%iTjhyog&*A~kKl?~cbI1C!hcO>8Jr)cJK?r}>?hpI-cb@YOz=nf|dlWF= zKQuGivEH=?JTs@(AMX3$AnY45I6pczdGyQ$?=Un7=rQgR7;^QUD;?;)Obz@*6zX~u zx@C)dUS9XKt1xTZ=?mk}y!syTIEo$Ug&Vy?ugL5HxaRQS#zl|!Bm{;OmjnWD61M}k z)B9COuY>U+7YsU{@+2|TpoyenqnaszCIf2PiE1sdUfYJBNSK)u`o|_CpB(@GrUyO^ zI+egs(~KsEMH*nc)<&(ZSBIb0Q&Hy+PA;v-^d)MO^jCm31&xNM((7S)9QpQb`Sp| -1) { + if (varList[i].ONLINE_STATUS === '0') { + point.icon_type = point.icon_type + '_online' + } else { + point.icon_type = point.icon_type + '_offline' + } + } points.push(point) } if (this.gangkouActive === '00004' && urlType === 'carPosition') { diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index cd17ac5..a879784 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -43,6 +43,9 @@ const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png') const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png') const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png') +const img6_1_online = require('../../../assets/map/gangkou_index/point/ico31_online.png') +const img6_1_offline = require('../../../assets/map/gangkou_index/point/ico31_offline.png') + const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png') @@ -61,7 +64,8 @@ const imgMap = { img6_0, img6_1, img7_0, img8_0, img8_1, img8_2, img8_3, - cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3 + cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3, + img6_1_online, img6_1_offline } export { imgMap } From 1269805fc94d36cee0e287bc3ac7dc372dd376e0 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 7 May 2024 13:45:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=82=B9=E4=BD=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/dialog/outSourceVideoInfo.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/map/dialog/outSourceVideoInfo.vue b/src/views/map/dialog/outSourceVideoInfo.vue index 1f9883a..a916b29 100644 --- a/src/views/map/dialog/outSourceVideoInfo.vue +++ b/src/views/map/dialog/outSourceVideoInfo.vue @@ -7,7 +7,9 @@ - + + +
视频名称{{ pd.VIDEONAME }}{{ pd.VIDEONAME }}在线状态{{ pd.ONLINE_STATUS }}
所属重点工程