From 6e7452c11304cfaf1a8db9b5421300a8263fc7a9 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 28 Jun 2024 21:07:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E9=97=A8=E5=8F=A3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/menjin_old.vue | 8 ++-- src/views/map/index.vue | 29 ++++++++++- src/views/map/js/dragentity.js | 64 +++++++++++++++++++++---- 3 files changed, 88 insertions(+), 13 deletions(-) diff --git a/src/views/map/components/menjin_old.vue b/src/views/map/components/menjin_old.vue index 406ea55..8a5b5d2 100644 --- a/src/views/map/components/menjin_old.vue +++ b/src/views/map/components/menjin_old.vue @@ -23,7 +23,7 @@ - +
@@ -56,8 +56,8 @@
时间
状态
闸机名称
- +
闸机名称
+
来港事由
diff --git a/src/views/map/index.vue b/src/views/map/index.vue index ac1f192..f5d8861 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -43,8 +43,13 @@ v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID" :corp-info-id="CORP_INFO_ID" :gangkou="gangkouActive"/> + @@ -275,6 +280,7 @@ import cmtIndex from './components/cmt_index.vue' import menjinCzks from './components/menjinCzks.vue' import renyuanCzks from './components/renyuanCzks.vue' import renyuanCmt from './components/renyuanCmt.vue' +import menjinOld from './components/menjin_old.vue' import menjin from './components/menjin.vue' import menjinCfd from './components/menjinCfd.vue' import menjinCmt from './components/menjinCmt.vue' @@ -332,6 +338,7 @@ export default { fengongsiIndex, caofeidianIndex, layoutMenu, + menjinOld, menjin, menjinCfd, menjinCmt, @@ -485,6 +492,26 @@ export default { checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), type: 'CAR', containAuthorization: [], + eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6'] + }, + { + label: '人员', + dialog_width: '800px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico1.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), + type: 'PERSON', + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], + eliminateAuthorization: [] + }, + { + label: '车辆', + dialog_width: '600px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico2.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'), + type: 'CAR', + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], eliminateAuthorization: [] }, { diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index eedf0d3..0532a93 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -53,6 +53,8 @@ const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png') const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png') const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png') const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png') +const GGimg1 = require('../../../assets/map/gangkou_index/point/ico1.png') +const GGimg2 = require('../../../assets/map/gangkou_index/point/ico2.png') const imgMap = { img0_0, img0_1, img0_2, @@ -116,15 +118,61 @@ export default class DragEntity { } } if (value.point_type.indexOf('标记点') !== -1) { - billboard = { - image: imgMap['img' + value.icon_type], - height: 36, - width: 30, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, - disableDepthTestDistance: Number.POSITIVE_INFINITY + console.info('====' ) + console.info(value ) + console.info('====' ) + if (value.label == '人员' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: GGimg1, + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '车辆' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: GGimg2, + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '摄像头' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: imgMap['img0_2' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '摄像头' ){ + billboard = { + image: imgMap['img0_2' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else{ + billboard = { + image: imgMap['img' + value.icon_type], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } } + } // 曹妃甸使用 if (value.gangkou === '00004') { From ebb141a699f6c05160b716110a9179663b83a45c Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Sat, 29 Jun 2024 12:45:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=98=BE=E7=A4=BA=E4=B8=80=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=9A=84=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=202.=E8=B0=83=E6=95=B4=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyprojects/videomanager/components/video-list.vue | 4 ++-- src/views/map/components/menjin_old.vue | 2 +- src/views/map/dialog/mkGateMachine.vue | 10 ++++++---- src/views/map/index.vue | 9 ++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue index 80881f7..fa13eec 100644 --- a/src/views/keyprojects/videomanager/components/video-list.vue +++ b/src/views/keyprojects/videomanager/components/video-list.vue @@ -154,8 +154,8 @@
-
-