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') {