~admin/srs-police-affairs.git

			@@ -5,12 +5,18 @@
			:polylineBtnSwitch="polylineBtnSwitch"></layers-show-control>

			<polygon-plot ref="PolygonPlotPage" :showingSecurityId="showingSecurityId"></polygon-plot>

			<polyline-plot ref="PolylinePlotPage" :showingSecurityId="showingSecurityId"></polyline-plot>

			<draw-btn-box ref="DRAWBTNBOX" :dialogVisible="dialogVisible" :isShowActivityEditBox="isShowActivityEditBox"
			:showingSecurityId="showingSecurityId" :policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch"
			:arrowBtnSwitch="arrowBtnSwitch" :policeIconId="policeIconId" :lineWidth="lineWidth"
			@setPoliceOption="setPoliceOption"></draw-btn-box>
			<two-draw-btn-box v-if="currentPlotType == 1" ref="DRAWBTNBOX" :dialogVisible="dialogVisible"
			:isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId"
			:policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch"
			:policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></two-draw-btn-box>

			<draw-btn-box v-if="currentPlotType == 3" ref="DRAWBTNBOX" :dialogVisible="dialogVisible"
			:isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId"
			:policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch"
			:policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></draw-btn-box>

			<police-car-change ref="PoliceCarChange" :policeOption="policeOption"
			:showingSecurityId="showingSecurityId"></police-car-change>
			@@ -38,11 +44,11 @@
			import polygonPlot from './polygonPlot.vue'
			import polylinePlot from './polylinePlot.vue'
			import drawBtnBox from './drawBtnBox.vue'
			import twoDrawBtnBox from './twoDrawBtnBox.vue'
			import policeCarChange from './policeCarChange.vue'
			import policePersonChange from './policePersonChange.vue'
			import activityDetail from './activityDetail.vue'
			import videoControlBox from './videoControlBox.vue'


			// 要素的
			let pointCircleCarLayer = null
			@@ -83,13 +89,15 @@
			isHavePoliceCar: false,
			isHavePoliceMan: false,
			isHavePointDraw: false,
			isHaveFactor: false
			isHaveFactor: false,
			currentPlotType: 1
			}
			},

			components: {
			layersShowControl,
			drawBtnBox,
			twoDrawBtnBox,
			polygonPlot,
			polylinePlot,
			policeCarChange,
			@@ -239,8 +247,9 @@
			},

			reloadAll (params) {
			this.currentPlotType = params.item.plotType

			this.closeActivityDetails()
			this.$refs.DRAWBTNBOX.startDraw()
			// 当前选中的ID
			this.showingSecurityId = params.item.id
			// 当前选中的详情
			@@ -394,10 +403,15 @@
			initLayersCoverage (type, color, params, position, altitude) {
			if (altitude.length) position = position.split(';').map((item, index) => `${item},${altitude[index]}`).join(';')
			let coverage = new global.DC[type](position)

			if (type == 'Polygon') {
			coverage.setStyle({
			material: color.curColor,
			perPositionHeight: true,
			extrudedHeight: null,
			perPositionHeight: this.currentPlotType == 3 ? true : false,
			closeTop: false,
			closeBottom: false,
			// classificationType: global.DC.Namespace.Cesium.ClassificationType.TERRAIN
			outline: true,
			outlineColor: color.outColor,
			outlineWidth: 4.0,
			@@ -405,7 +419,14 @@

			coverage.customType = 'polygon'
			} else {
			coverage.setStyle({ material: color.curColor })
			coverage.setStyle({
			material: color.curColor,
			outline: true,
			outlineColor: color.outColor,
			outlineWidth: 4.0,
			})

			coverage.customType = 'polyArrows'
			}
			coverage.attrParams = { id: params.id, color: params.color, item: params }
			coverage.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
			@@ -498,7 +519,6 @@

			// 鼠标移入图标事件
			pointMouseOver (e) {
			console.log(e, 959999)
			this.$store.commit('SET_ACTIVITYPOLICEPOPUP', true)
			let hoverData = {}
			if ('carId' in e.overlay.attrParams.data) {
			@@ -571,13 +591,12 @@
			item.polygonPositionStr = positionStr

			let lineObj = new global.DC.Polyline(positionNewArr)
			lineObj.customType == 'polyline'
			lineObj.customType = 'polyline'
			lineObj.setStyle({
			material: lineColor,
			clampToGround: this.currentPlotType == 3 ? false : true,
			width: 3
			})

			item.lineObj = lineObj

			lineLayer.addOverlay(lineObj)

			@@ -585,7 +604,7 @@
			layerName: 'newCarDrawLineLayers',
			positions: positionStr,
			material: color,
			params: item,
			params: { ...item, lineObj },
			incident: this.lineOverlayTypeClick
			})

			@@ -739,8 +758,6 @@
			convertPolylineOrPolygonPositionDate (data, type) {
			let heightData = data.altitude.split(',')
			let positionStr = type == 'port' ? data.position.slice(11, data.position.length - 1) : data.position.slice(12, data.position.length - 2)

			console.log(data, positionStr, 4555, '线段')

			let positionArr = positionStr.split(',')