| src/components/map/components/activityPolicePopup.vue | ●●●●● patch | view | raw | blame | history | |
| src/components/map/index.vue | ●●●●● patch | view | raw | blame | history | |
| src/styles/base/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/styles/media/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/views/activity/components/drawBtnBox.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/activity/index.vue | ●●●●● patch | view | raw | blame | history |
src/components/map/components/activityPolicePopup.vue
@@ -23,16 +23,48 @@ <div class="name">警车型号：</div> <div class="value"> {{ activityPolicePopupData.carType }}</div> </div> <div class="line"> <div class="name">车牌号：</div> <div class="value"> {{ activityPolicePopupData.carNo }}</div> </div> <div class="line"> <div class="name">单位名称：</div> <div class="value"> {{ activityPolicePopupData.unitName }}</div> </div> <div class="line"> <div class="name">单位编号：</div> <div class="value"> {{ activityPolicePopupData.unitCode }}</div> </div> <div class="line"> <div class="name">所属辖区：</div> <div class="value"> {{ activityPolicePopupData.deptName }}</div> </div> </div> <div class="data-box" v-if="activityPolicePopupData.policeStationName != 'none'"> <div class="line"> <div class="name">所属派出所：</div> <div class="name">警员姓名：</div> <div class="value"> {{ activityPolicePopupData.policeData.name }}</div> </div> <div class="line"> <div class="name">警员编号：</div> <div class="value"> {{ activityPolicePopupData.policeData.serialNumber }}</div> </div> <div class="line"> <div class="name">联系电话：</div> <div class="value"> {{ activityPolicePopupData.policeData.contact }}</div> </div> <div class="line"> <div class="name">单位名称：</div> <div class="value">{{ activityPolicePopupData.policeStationName }}</div> </div> <div class="line"> <div class="name">警员姓名：</div> <div class="value"> {{ activityPolicePopupData.policeData.name }}</div> <div class="name">单位编号：</div> <div class="value"> {{ activityPolicePopupData.policeData.unitCode }}</div> </div> <div class="line"> <div class="name">所属辖区：</div> <div class="value"> {{ activityPolicePopupData.policeData.deptName }}</div> </div> </div> @@ -93,7 +125,7 @@ .content { width: 220px; height: 60px; height: 130px; background: $bg-color; border-radius: 4px; color: #fff; src/components/map/index.vue
@@ -303,7 +303,7 @@ // global.viewer.addTerrain(terrain) // 内网 that.switchImg() // that.switchImg() // 外网 // global.viewer.imageryLayers.addImageryProvider( src/styles/base/index.scss
@@ -1030,6 +1030,11 @@ height: 15px; margin-bottom: 0px; } .edit-plot-btn-box { display: flex; justify-content: center; } } } } src/styles/media/index.scss
@@ -2264,13 +2264,17 @@ } .value-name-box { width: countSizeVh(110); width: countSizeVh(120); } input { height: countSizeVh(30); font-size: countSizeVh(16); border: countSizeVh(1) solid rgb(0, 92, 169); } .alpha { width: calc(100% - countSizeVh(140)); } } @@ -2309,6 +2313,10 @@ height: countSizeVh(15); margin-bottom: countSizeVh(0); } .alpha { width: calc(100% - countSizeVh(160)); } } } } src/views/activity/components/drawBtnBox.vue
@@ -352,8 +352,8 @@ }, removeDrawArrow () { drawArrowLayers != null && drawArrowLayers.clear() // drawArrowLayers != null && drawArrowLayers.clear() addPlotOverlayData != null && addPlotOverlayData.remove() labelOverLayerID = [] }, @@ -679,7 +679,6 @@ // 单击文字标绘 reEditLabel (e) { console.log(e,2233); lableOverlayData = e.overlay this.$EventBus.$emit('closeTooltip') this.labelId = e.overlay.attrParams.id src/views/activity/index.vue
@@ -195,7 +195,7 @@ </div> </div> <div class="line"> <div class="value-name-box">选择颜色：</div> <div class="value-name-box">选择标绘颜色：</div> <div class="pick-color-box"> <el-color-picker v-model="choosePlotColor" :predefine="predefineColors" size="small"> </el-color-picker> @@ -217,13 +217,6 @@ <el-dialog title="修改标绘" :modal="false" :visible.sync="editPlotVisible" :close-on-click-modal="true" class="edit-plot-box"> <div> <div class="value-name-box">设置透明度：</div> <div class="alpha"> <el-slider v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider> </div> </div> <div v-show="!polygonName" class="placeholder"></div> <div> <div class="value-name-box">选择标绘颜色：</div> <div class="pick-color-box"> <el-color-picker v-model="choosePlotColor" :predefine="predefineColors" size="small"> @@ -232,6 +225,13 @@ </div> <div v-show="!polygonName" class="placeholder"></div> <div> <div class="value-name-box">设置透明度：</div> <div class="alpha"> <el-slider v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider> </div> </div> <div v-show="!polygonName" class="placeholder"></div> <div class="edit-plot-btn-box"> <el-button @click="savePlot">保存</el-button> <el-button @click="editPlot">编辑</el-button> <el-button @click="deletePlot">删除</el-button> @@ -1129,7 +1129,7 @@ getCarList () { getCarList().then(res => { res.data.data.forEach(item => { policecarOption.push({ value: `${item.id}`, label: `${item.serialNumber}`, carType: `${item.carType}` }) policecarOption.push({ value: `${item.id}`, label: `${item.serialNumber}`, carType: `${item.carType}`,serialNumber:`${item.serialNumber}`,unitCode:`${item.unitCode}`,unitName:`${item.unitName}`,carNo:`${item.carNo}`,deptName:`${item.deptName}`}) }) }) }, @@ -1166,6 +1166,7 @@ addActivityPolice (params) { addActivityPolice(params).then(res => { if (res.data.success) { console.log(res.data.data,2233223); this.$message({ message: '添加成功', type: 'success' @@ -1176,7 +1177,7 @@ type: 'error' }) } this.getSecurityPoliceList(params.securityId, this.policeSwitch) // this.getSecurityPoliceList(params.securityId, this.policeSwitch) }) }, @@ -1443,6 +1444,7 @@ } 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 @@ -1732,15 +1734,19 @@ 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)
