1

guanqb

2023-03-17 364e253e94d70fa3e6545426989c69acaad41eda

1

 src/store/modules/popupParams.js

@@ -23,6 +23,7 @@
        videoListPopup: false,
        videoListPopupData: {}
    },

    mutations: {
        SET_DETAILSPOPUP (state, detailsPopup) {
            state.detailsPopup = detailsPopup
@@ -33,7 +34,6 @@

        SET_ACTIVITYPOLICEPOPUP (state, activityPolicePopup) {
            state.activityPolicePopup = activityPolicePopup
            console.log('isshowPopup', activityPolicePopup)
        },

        SET_ACTIVITYPOLICEPOPUPDATA (state, activityPolicePopupData) {
@@ -49,6 +49,7 @@
        },

    },

    actions: {

    }

 src/styles/base/index.scss

@@ -780,6 +780,24 @@
            line-height: 32px;
            width: 100px;
        }

        .input-width-box {
            input {
                outline: none;
                width: 80px;
                height: 28px;
                background-color: rgba(8, 56, 185, 0.5);
                border: none;
                color: #fff;
                border-radius: 4px;
                padding-left: 15px;
            }

            input:focus {
                border-color: #409EFF;
                border: 1px solid #409EFF;
            }
        }
    }
}


 src/styles/media/index.scss

@@ -2129,7 +2129,7 @@

                        .el-dialog {
                            width: countSizeVw(320, 1920);
                            height: countSizeVh(190);
                            height: countSizeVh(220);
                        }

                        .el-dialog .el-dialog__body .el-button {

 src/views/activity/components/drawBtnBox.vue

@@ -528,6 +528,8 @@
                areaPolygon.on(global.DC.MouseEventType.CLICK, this.$parent.lineOverlayTypeClick)
           } else {
               let positionObj = this.$parent.convertBillboardPositionDate(data, type)
               positionObj.lng = positionObj.lng.slice(1,positionObj.lng.length-1)
               positionObj.lat = positionObj.lat.slice(0,positionObj.lat.length-2)
               let positionArr = data.position.slice(7, 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)

 src/views/activity/components/mapSearchBox.vue

@@ -92,6 +92,7 @@
        getSearchExtensively (ak, region, query) {
            getSearchExtensively(ak, region, query).then(res => {
                this.searchExtensivelyArray = res.data.result
                console.log(res.data.result,11111);
            })
        },


 src/views/activity/index.vue

@@ -148,6 +148,15 @@
                        </el-color-picker>
                    </div>
                </div>
                <div class="line area">
                    <div class="value-name-box">选择预警范围：</div>
                    <div>
                        <div class="input-width-box">
                            <input type="text" v-model="pointAreaWidth" placeholder="请输入..." />
                        </div>
                        <div class="units">米</div>
                    </div>
                </div>
                <div class="police-btn-box">
                    <el-button @click="determine" v-show="!isChoosePoliceElementDisabled">确定</el-button>
                    <el-button @click="deletePoliceElement"
@@ -473,6 +482,7 @@
            }],
            isNeedPolygonType: false,
            plotPointPositionStr: '',
            pointAreaWidth:100,
        }
    },

@@ -975,6 +985,7 @@
                    let b = parseInt(item.color.slice(5, 7), 16)
                    color = global.DC.Namespace.Cesium.Color.fromBytes(r, g, b, 255)
                }
                console.log('item',item);
                point.attrParams = positionObj
                curLayer.addOverlay(point)
                point.setStyle({
@@ -987,6 +998,14 @@
                point.on(global.DC.MouseEventType.MOUSE_OVER, this.pointMouseOver)
                point.on(global.DC.MouseEventType.MOUSE_OUT, this.pointMouseOut)
                positionObj.pointOverlayData = point

                // 预警范围先不显示
                // let circle = new global.DC.Circle(position, item.width != -1 ? item.width : 100)
                // curLayer.addOverlay(circle)
                // circle.setStyle({
                //     "material": global.DC.Namespace.Cesium.Color.fromBytes(255, 0, 0, 100), //颜色
                // })
                
                this.$EventBus.$emit('layerPointAdd', {
                    layerName: mapLayer,
                    type: 'billboard',