修复添加警员警车无选中时bug

guanqb

2023-03-01 3ba82e922faf4eedf84da7dab496a1f4ab2ee971

修复添加警员警车无选中时bug

 src/views/activity/index.vue

@@ -359,7 +359,7 @@
                </div>
            </div>
                <el-button @click="determine" v-show="!isChoosePoliceElementDisabled">确定</el-button>
                <el-button @click="deletePoliceElement" v-show="!isChoosePoliceElementDisabled">删除</el-button>
                <el-button @click="deletePoliceElement" v-show="!isChoosePoliceElementDisabled&&policeIconIsCreated">删除</el-button>
                <el-button @click="cancel" v-show="!isChoosePoliceElementDisabled">取消</el-button>
            </div>
        </el-dialog>
@@ -384,7 +384,7 @@
            </div>
                <div class="police-btn-box">
                    <el-button @click="determine" v-show="!isChoosePoliceElementDisabled">确定</el-button>
                    <el-button @click="deletePoliceElement" v-show="!isChoosePoliceElementDisabled">删除</el-button>
                    <el-button @click="deletePoliceElement" v-show="!isChoosePoliceElementDisabled&&policeIconIsCreated">删除</el-button>
                    <el-button @click="cancel" v-show="!isChoosePoliceElementDisabled">取消</el-button>
                </div>
            </div>
@@ -703,7 +703,6 @@
            arrowPositionSre: '',
            isLineEdit: true,
            addLinePosition: '',
            color: 'rgba(255, 69, 0)',
            predefineColors: [
            '#ff4500',
            '#ff8c00',
@@ -1715,14 +1714,31 @@
                    position = position.slice(0, position.length - 1)
                }
                if (this.policeChooseCarVisible == true) {
                    this.policeChooseCarVisible = false
                    this.addCarAndRange({ carId: this.policeType, position: position, securityId: this.showingSecurityId, type: type ,color:this.chooseCarColor})
                    if (this.polygonName == '') {
                    this.$message({
                        message: '请选择警车',
                        type: 'error'
                    })
                    } else {
                          this.policeChooseCarVisible = false
                          this.addCarAndRange({ carId: this.policeType, position: position, securityId: this.showingSecurityId, type: type ,color:this.chooseCarColor})
                          this.policeIconIsCreated = false
                    }
                  
                } else if (this.policeChooseVisible == true) {
                    this.policeChooseVisible = false

                    this.addActivityPolice({policemanId:this.searchPoliceTreeId, position:position, securityId:this.showingSecurityId, type:type,color:this.choosePoliceColor})
                    if (this.polygonName == '') {
                    this.$message({
                        message: '请选择警员',
                        type: 'error'
                    })
                    } else {
                         this.policeChooseVisible = false
                         this.addActivityPolice({policemanId:this.searchPoliceTreeId, position:position, securityId:this.showingSecurityId, type:type,color:this.choosePoliceColor})
                         this.policeIconIsCreated = false
                    }
                   
                }
                this.policeIconIsCreated = false
                
            } else {
                if (this.policeChooseVisible == true) {
                    this.updateActivityPolice({id:this.policeIconId, policemanId:this.searchPoliceTreeId,color:this.choosePoliceColor})

 src/views/video/region.vue

@@ -230,7 +230,7 @@
            class="edit-range-box">
            <div>
                <div class="value-name-box">选择范围颜色：</div>
                <div class="color-box">
                <!-- <div class="color-box">
                    <div class="red-color" @click="changeRangeColor('#FF0000')">{{ chooseRangeColor == '#FF0000' ? '√' : '' }}
                    </div>
                    <div class="green-color" @click="changeRangeColor('#00FF00')">{{ chooseRangeColor == '#00FF00' ? '√' : ''
@@ -239,6 +239,15 @@
                    <div class="blue-color" @click="changeRangeColor('#0000FF')">{{ chooseRangeColor == '#0000FF' ? '√' : ''
                    }}
                    </div>
                </div> -->
                <div class="line">
                <div class="value-name-box">选择颜色：</div>
                <div class="pick-color-box">
                    <el-color-picker
                     v-model="changeRangeColor"
                     :predefine="predefineColors" size="small">
                   </el-color-picker>
                </div>
                </div>
            </div>
            <div v-show="isLineRange">
@@ -346,6 +355,22 @@
            rangeOverlayData:{},
            isLineRange:false,
            isEndDrawPlot:true,
            predefineColors: [
            '#ff4500',
            '#ff8c00',
            '#ffd700',
            '#90ee90',
            '#00ced1',
            '#1e90ff',
            '#c71585',
            'rgba(255, 69, 0, )',
            'rgb(255, 120, 0)',
            'hsv(51, 100, 98)',
            'hsva(120, 40, 94)',
            'hsl(181, 100%, 37%)',
            'hsla(209, 100%, 56%)',
            '#c7158577'
            ],
        }
    },