forked from srs-police-affairs
| src/views/activity/components/drawBtnBox.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/activity/index.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/login/index.vue | ●●●●● patch | view | raw | blame | history |
src/views/activity/components/drawBtnBox.vue
@@ -102,6 +102,7 @@ let eventLast = 0 let addPlotOverlayData = null let addPoliceIconOverlayData = null let lableOverlayData = null export default { @@ -162,17 +163,16 @@ if (isAddLabel) return if (poltType == 'billboard' && policeType == 'policeman') { overlay.icon = '/img/icon/police-people.png' overlay.icon = '/img/icon/man3.png' } else if (poltType == 'billboard' && policeType == 'policecar') { overlay.icon = '/img/policeCar.jfif' overlay.icon = '/img/car3.png' } if (overlay) { drawLayers.addOverlay(overlay) plot.edit(overlay, (e) => { // drawLayers.addOverlay(overlay) drawLayers.addOverlay(overlay) flag = true @@ -183,6 +183,7 @@ overlay.policeType = policeType that.$emit('setOverlayObj', overlay) addPoliceIconOverlayData = overlay document.oncontextmenu = function () { if (flag == true && poltType == 'billboard') { @@ -193,7 +194,6 @@ that.$parent.policeChooseVisible = true } else if (policeType == 'policecar') { that.$emit('setPoliceOption') that.$parent.chooseCarColor = '#FF0000' that.$parent.policeChooseCarVisible = true } @@ -366,7 +366,7 @@ plot.edit(overlayData, (e) => { let position = '' if('_positions' in overlayData){ overlayData._positions.forEach(item => { overlayData._positions.forEach((item,index) => { position += item._lng + ' ' + item._lat + ',' }) position = position.slice(0, position.length - 1) @@ -471,6 +471,43 @@ } }, addNewPolice(data,type){ let positionObj = this.$parent.convertBillboardPositionDate(data, type) let positionArr = data.position.slice(12, data.position.length - 2).split(',')[0].split(' ') let position = new global.DC.Position(Number(positionArr[0]), Number(positionArr[1])) let point = new global.DC.Point(position) let color = '' if (data.color == '') { color = global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 150) } else { let r = parseInt(data.color.slice(1, 3), 16) let g = parseInt(data.color.slice(3, 5), 16) let b = parseInt(data.color.slice(5, 7), 16) color = global.DC.Namespace.Cesium.Color.fromBytes(r, g, b, 255) } console.log(positionObj,position,point,999); point.attrParams = positionObj drawLayers.addOverlay(point) point.setStyle({ "color": global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 150), //颜色 "outlineColor": color, //边框颜色 "outlineWidth": 0, //边框大小， "pixelSize": 82, }) point.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick) point.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver) point.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut) addPoliceIconOverlayData.attrParams = positionObj addPoliceIconOverlayData.position = { lng: Number(positionArr[0]), lat: Number(positionArr[1]), alt: 0.5, } addPoliceIconOverlayData.on(global.DC.MouseEventType.CLICK, this.$parent.overlayTypeClick) addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OVER, this.$parent.pointMouseOver) addPoliceIconOverlayData.on(global.DC.MouseEventType.MOUSE_OUT, this.$parent.pointMouseOut) }, // 修改标绘样式 editPlotStyle(params,overlay) { if('color' in params){ src/views/activity/index.vue
@@ -1166,7 +1166,7 @@ addActivityPolice (params) { addActivityPolice(params).then(res => { if (res.data.success) { console.log(res.data.data,2233223); this.$refs.DRAWBTNBOX.addNewPolice(res.data.data,'policecar') this.$message({ message: '添加成功', type: 'success' @@ -1357,14 +1357,14 @@ policeChooseBeforeClose () { this.policeChooseVisible = false this.policeIconIsCreated = false this.$refs.DRAWBTNBOX.removeDraw() // this.$refs.DRAWBTNBOX.removeDraw() }, // 选择警车关闭 policeChooseCarBeforeClose () { this.policeChooseCarVisible = false this.policeIconIsCreated = false this.$refs.DRAWBTNBOX.removeDraw() // this.$refs.DRAWBTNBOX.removeDraw() }, // 选择警员确认按钮 @@ -1444,7 +1444,6 @@ } else { this.isChoosePoliceElementDisabled = true } console.log(e,777777); if ('policemanId' in e.overlay.attrParams.data) { this.policeIconId = e.overlay.attrParams.data.id this.policeType = e.overlay.attrParams.data.policemanId @@ -1513,6 +1512,15 @@ // 双击修改箭头 reeditArrowDbClick (e) { if(e.overlay.attrParams.item.type == 5){ let polygonNewPositions = [] e.overlay.positions.forEach((item,index)=>{ if(index%2==0){ polygonNewPositions.push(item) } }) e.overlay.positions = polygonNewPositions } this.$refs.DRAWBTNBOX.plotEdit(e.overlay, 'arrow') }, @@ -1522,7 +1530,6 @@ this.$refs.DRAWBTNBOX.overlayClickPosition(e) } else { plotOverlayData = e this.choosePlotColor = e.overlay.attrParams.color != '' ? e.overlay.attrParams.color.slice(0, 7) : '#409EFF' this.choosePlotColorAlpha = e.overlay.attrParams.color != '' ? Number(e.overlay.attrParams.color.split(',')[1]) : 100 @@ -1734,18 +1741,14 @@ this.$store.commit('SET_ACTIVITYPOLICEPOPUP', true) let hoverData = {} if ('carId' in e.overlay.attrParams.data) { console.log(e.overlay.attrParams.data,555); hoverData = policecarOption.filter(item => item.value == e.overlay.attrParams.data.carId)[0] hoverData.policeData = { 'name': 'none' } hoverData.policeStationName = 'none' } else { let policeArr = this.filterTree(this.policeTreeData) console.log('policeArr',policeArr); hoverData.policeData = policeArr.filter(item => item.id == e.overlay.attrParams.data.policemanId)[0] hoverData.policeStationName = policeArr.filter(item => item.id == policeArr.filter(item => item.id == e.overlay.attrParams.data.policemanId)[0].parentId)[0].name hoverData.carType = 'none' hoverData.label = 'none' hoverData.label = 'none' hoverData.label = 'none' } this.$store.commit('SET_ACTIVITYPOLICEPOPUPDATA', hoverData) src/views/login/index.vue
@@ -96,8 +96,8 @@ { required: true, message: '用户名不能为空', trigger: 'blur' }, { min: 3, max: 10, message: '用户账号长度在3~10个字符之间', // max: 10, message: '用户账号长度至少3位', trigger: 'blur' } ],
