Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-01-09 92b73718e330e1a5abd8ed13cacb724587bdfc66

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 src/styles/media/index.scss

@@ -1592,32 +1592,40 @@
                            padding: countSizeVh(8);
                            bottom: countSizeVh(40);
                            border-radius: countSizeVh(8);
                            width: countSizeVw(480, 1920);
                            z-index: 99;

                            &>div {
                                height: countSizeVh(44);
                                line-height: countSizeVh(44);
                            }

                            .close {
                                height: countSizeVh(20);
                            }

                            ul {
                                li {
                                    button {
                                        padding: 0 countSizeVh(6);
                                        min-width: countSizeVw(60, 1920);
                                        line-height: countSizeVh(30);
                                        height: countSizeVh(30);
                                        margin: countSizeVh(7) countSizeVw(5, 1920);
                                        border: countSizeVh(1) solid #cecece;
                                        border-radius: countSizeVh(4) countSizeVw(4, 1920);
                                        font-size: countSizeVh(16);
                            .left ,.right{
                                h3{
                                    font-size: countSizeVh(16);
                                    height: countSizeVh(30);
                                    line-height: countSizeVh(30);
                                }
                                &>div {
                                    height: countSizeVh(44);
                                    line-height: countSizeVh(44);
                                }
    
                                ul {
                                    li {
                                        button {
                                            padding: 0 countSizeVh(6);
                                            min-width: countSizeVw(60, 1920);
                                            line-height: countSizeVh(30);
                                            height: countSizeVh(30);
                                            margin: countSizeVh(7) countSizeVw(5, 1920);
                                            border: countSizeVh(1) solid #cecece;
                                            border-radius: countSizeVh(4) countSizeVw(4, 1920);
                                            font-size: countSizeVh(16);
                                        }
                                    }
                                }
                            }

                            .right {
                                padding-top: countSizeVh(35);
                                ul li {
                                    height: countSizeVh(50);
                                }
                            }
                        }

                        .second-container {

 src/views/activity/index.vue

@@ -122,66 +122,75 @@
            </div>
        </div>

        <div class="draw-btn-box" v-show="arrangeVisible">
            <div>
                <span>警力资源：</span>
        <div v-show="dialogVisible" class="draw-btn-box">
            <div class="left">
                <h3>预案布置</h3>
                <div>
                    <span>警力资源：</span>

                <ul>
                    <li>
                        <button @click="draw('billboard', 'policeman')" title="警员">
                            <img
                                src="../../../public/img/icon/police-people-btn.png"
                                style="height:100%"
                            />
                        </button>
                    </li>
                    <li>
                        <button @click="draw('billboard', 'policecar')" title="警车">
                            <img src="../../../public/img/icon/car-btn.png" style="height:100%" />
                        </button>
                    </li>
                    <!-- <li>
                    <ul>
                        <li>
                            <button @click="draw('billboard', 'policeman')" title="警员">
                                <img
                                    src="../../../public/img/icon/police-people-btn.png"
                                    style="height:100%"
                                />
                            </button>
                        </li>
                        <li>
                            <button @click="draw('billboard', 'policecar')" title="警车">
                                <img src="../../../public/img/icon/car-btn.png" style="height:100%" />
                            </button>
                        </li>
                        <!-- <li>
                        <button @click="draw('polyline', 'policecar')">巡逻路线</button>
                    </li>-->
                </ul>
            </div>
            <div>
                <span>作战标绘：</span>
                        </li>-->
                    </ul>
                </div>
                <div>
                    <span>作战标绘：</span>

                <ul>
                    <li>
                        <button @click="drawArrow('attack_arrow')" title="进攻箭头">进攻箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('double_arrow')" title="双箭头">双箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('fine_arrow')" title="直箭头">直箭头</button>
                    </li>
                    <li>
                        <button @click="drawArrow('tailed_attack_arrow')" title="燕尾箭头">燕尾箭头</button>
                    </li>
                    <li>
                        <button @click="removeAllArrow()">清除</button>
                    </li>
                </ul>
            </div>
            <div>
                <span>撤离路线：</span>
                <ul>
                    <li>
                        <!-- <el-button
                    <ul>
                        <li>
                            <button @click="drawArrow('attack_arrow')" title="进攻箭头">进攻箭头</button>
                        </li>
                        <li>
                            <button @click="drawArrow('double_arrow')" title="双箭头">双箭头</button>
                        </li>
                        <li>
                            <button @click="drawArrow('fine_arrow')" title="直箭头">直箭头</button>
                        </li>
                        <li>
                            <button @click="drawArrow('tailed_attack_arrow')" title="燕尾箭头">燕尾箭头</button>
                        </li>
                    </ul>
                </div>
                <div>
                    <span>巡逻路线：</span>
                    <ul>
                        <li>
                            <!-- <el-button
                            title="路线绘制"
                            @click="draw('billboard', 'policeman')"
                            icon="el-icon-my-route"
                        ></el-button>-->
                        <button @click="draw('polyline', 'policecar')" title="撤离路线">
                            <img src="../../../public/img/icon/route1.png" style="height:100%" />
                        </button>
                            ></el-button>-->
                            <button @click="draw('polyline', 'policecar')" title="巡逻路线">
                                <img src="../../../public/img/icon/route1.png" style="height:100%" />
                            </button>
                        </li>
                    </ul>
                </div>
            </div>
            <div class="right">
                <ul>
                    <li>
                        <button @click="removeAllArrow()">清除</button>
                    </li>
                    <li>
                        <button>保存</button>
                    </li>
                </ul>
            </div>
            <div class="close" @click="arrangeVisible = false"></div>
        </div>

        <div class="second-container" :class="{ 'spread': boxShow, 'take-back': !boxShow }">
@@ -264,10 +273,6 @@
                    ></el-input>
                </div>
            </div>-->

            <div class="row-btn-box">
                <el-button @click="arrangeDraw">预案布置</el-button>
            </div>
        </div>

        <div class="plan-control" v-show="dialogVisible">
@@ -283,6 +288,17 @@
                </div>
            </div>

            <div class="row-box">
                <div class="category">作战标绘</div>
                <div class="category-value">
                    <el-switch
                        v-model="arrowBtnSwitch"
                        @change="switchArrowBtnChange"
                        active-color="#13ce66"
                        inactive-color="#ccc"
                    ></el-switch>
                </div>
            </div>
            <div class="row-box">
                <div class="category">巡逻路线：</div>
                <div class="category-value">
@@ -544,9 +560,9 @@
                label: 'label'
            },
            dialogVisible: false,
            arrangeVisible: false,
            currentClickIndex: '',
            polylineSwitch: false,
            arrowBtnSwitch: false,
            polylineBtnSwitch: false,
            analyseInput: 100,
            activityList: [],
@@ -1003,6 +1019,11 @@
            }
        },

        // 切换作战标绘
        switchArrowBtnChange (e) {

        },

        // 切换轨迹播放控件
        switchBtnChange (e) {
            this.isTrackBtnShow = e
@@ -1028,7 +1049,6 @@
        // 关闭活动详情弹窗
        closeActivityDetails () {
            this.dialogVisible = false
            this.arrangeVisible = false
            this.currentClickIndex = ''
            this.polylineSwitch = false
            analyseLayer.clear()
@@ -1118,10 +1138,6 @@

        removeAllArrow () {
            drawArrowLayers.clear()
        },

        arrangeDraw () {
            this.arrangeVisible = true
        },

        // 播放轨迹
@@ -1590,6 +1606,7 @@

    .draw-btn-box {
        position: fixed;
        display: flex;
        left: 50%;
        bottom: 40px;
        color: #fff;
@@ -1597,39 +1614,54 @@
        white-space: nowrap;
        transform: translate(-50%, 0);

        & > div {
            display: flex;
        }
        .left,
        .right {
            height: 100%;

        ul {
            display: flex;
            & > div {
                display: flex;
            }

            li {
                button {
                    height: 30px;
                    margin: 0 5px;
                    background-color: $bg-color;
                    border: 1px solid #cecece;
                    border-radius: 4px;
                    color: #fff;
                    cursor: pointer;
                    outline: none;
            ul {
                display: flex;

                li {
                    button {
                        height: 30px;
                        margin: 0 5px;
                        background-color: $bg-color;
                        border: 1px solid #cecece;
                        border-radius: 4px;
                        color: #fff;
                        cursor: pointer;
                        outline: none;
                    }
                }
            }
        }

        .close {
            position: absolute;
            top: 2%;
            right: 2%;
            height: 10px;
            transform: translate(0, -50%);
            cursor: pointer;
        .left {
            width: 80%;
            h3 {
                font-size: 16px;
                height: 30px;
                line-height: 30px;
                width: 100%;
                padding-left: 16%;
            }
        }

        .close::before {
            content: '\e6db';
            font-family: element-icons;
        .right {
            width: 20%;
            padding-top: 35px;
            ul {
                flex-direction: column;
                li {
                    height: 50px;
                    button {
                        background-color: #2a56cf;
                    }
                }
            }
        }
    }

@@ -1710,22 +1742,6 @@

            .category-value {
                flex: 1;
            }
        }

        .row-btn-box {
            // height: 30px;
            :deep(.el-button) {
                // padding: 7px 20px;
                font-size: 14px;
                color: #fff;
                background-color: rgba(8, 56, 185, 0.9);
                border: 1px solid rgba(8, 56, 185, 0.9);
                border-radius: 14px;
            }

            :deep(.el-button:hover) {
                background-color: #409eff;
            }
        }
    }