1

guanqb

2023-03-04 77fabf8ca8283e6f88111252703d9db5a898fe91

1

 src/styles/base/index.scss

@@ -955,6 +955,10 @@
            .el-input--suffix .el-input__inner {
                padding-right: 10px;
            }

            .placeholder {
                height: 26px;
            }
        }
    }
}

 src/styles/media/index.scss

@@ -2273,6 +2273,10 @@
                                    border: countSizeVh(1) solid rgb(0, 92, 169);
                                }

                                .placeholder {
                                    height: countSizeVh(26);
                                }

                            }
                        }
                    }

 src/views/activity/index.vue

@@ -412,7 +412,7 @@
                    <input type="text" v-model="polygonName" />
                </div>
            </div> -->
            <div class="line">
            <div class="line" v-show="isNeedPolygonType">
                <div class="value-name-box">选择类型：</div>
                <div class="select-type">
                    <el-select size="small" v-model="polygonAreaType" placeholder="请选择区域类型">
@@ -422,18 +422,19 @@
                </div>
            </div>
            <div class="line">
                <div class="value-name-box">设置透明度：</div>
                <div class="alpha">
                    <el-slider v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider>
                </div>
            </div>
            <div class="line">
                <div class="value-name-box">选择颜色：</div>
                <div class="pick-color-box">
                    <el-color-picker v-model="choosePlotColor" :predefine="predefineColors" size="small">
                    </el-color-picker>
                </div>
            </div>
            <div class="line">
                <div class="value-name-box">设置透明度：</div>
                <div class="alpha">
                    <el-slider v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider>
                </div>
            </div>
            <div class="placeholder" v-show="!isNeedPolygonType"></div>
            <div class="add-polygon-btn-box">
                <el-button @click="savePolygonInfo">保存</el-button>
                <el-button @click="cancelSavePolygon">取消</el-button>
@@ -690,7 +691,7 @@
            videoShow: false,
            lineEditVisible: false,
            lineEditTitle: '修改巡逻路线',
            polygonAddTitle: '新增活动区域',
            polygonAddTitle: '新增标绘',
            polygonAddVisible: false,
            polygonName: '',
            polygonPositionStr: '',
@@ -752,7 +753,9 @@
            }, {
              value: 2,
              label: '缓冲区'
            }]
            }],
            isNeedPolygonType:false,
            plotPointPositionStr:'',
        }
    },

@@ -1603,6 +1606,7 @@
                                    that.choosePlotColorAlpha = 48
                                    that.polygonAreaType = 1
                                    that.isNeedName = true
                                    that.isNeedPolygonType = true
                                    that.polygonName = ''
                                    that.polygonAddVisible = true
                                    flag = false
@@ -1623,7 +1627,16 @@
                    if (overlay) {
                    drawArrowLayers.addOverlay(overlay)
                    plot.edit(overlay, (e) => {
                        console.log(overlay,3333);
                        flag = true
                        this.plotPointPositionStr = overlay._positions._lng + ' ' + overlay._positions._lat
                        document.oncontextmenu = function () {
                                if (flag) {
                                    that.choosePlotColor =  '#409EFF'
                                    that.choosePlotColorAlpha = 48
                                    that.polygonAddVisible = true
                                    flag = false
                                }
                            }
                    })
                }
                })
@@ -1656,6 +1669,7 @@
                                if (flag) {
                                    that.choosePlotColor =  '#409EFF'
                                    that.isNeedName = false
                                    that.isNeedPolygonType = false
                                    that.polygonAddVisible = true
                                    flag = false
                                }
@@ -1992,6 +2006,9 @@
            this.choosePlotColorAlpha = e.overlay.attrParams.color != '' ? Number(e.overlay.attrParams.color.split(',')[1]) :  48
            if(e.overlay.attrParams.item.type == 5){
                this.polygonAreaType = e.overlay.attrParams.item.areaType != '' ? e.overlay.attrParams.item.areaType : 1
                this.isNeedPolygonType = true
            }else{
                this.isNeedPolygonType = false
            }
            // this.polygonName = e.overlay.attrParams.name
            if (this.userInfo.dept_id == '1123598813738675201' || this.userInfo.dept_id == this.activityDeptId) {