Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

shuishen

2022-12-01 caa53e80c8110996d9c39522209b7a249a688e24

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 public/img/policeCar.png

 src/views/activity/index.vue

@@ -77,13 +77,22 @@
                    <button @click="draw('billboard')">图标点</button>
                </li>-->
                <li>
                    <button @click="draw('billboard')">警员</button>
                    <button @click="draw('billboard','policeman')">警员</button>
                </li>
                <li>
                    <button @click="draw('polyline')">路线</button>
                    <button @click="draw('polyline','policeman')">警员路线</button>
                </li>
                <li>
                    <button @click="draw('polygon')">范围</button>
                    <button @click="draw('polygon','policeman')">警员范围</button>
                </li>
                <li>
                    <button @click="draw('billboard','policecar')">警车</button>
                </li>
                <li>
                    <button @click="draw('polyline','policecar')">警车路线</button>
                </li>
                <li>
                    <button @click="draw('polygon','policecar')">警车范围</button>
                </li>
                <!-- <li>
                    <button @click="draw('circle')">圆</button>
@@ -747,14 +756,16 @@
        },

        // 地图元素绘制
        draw (type) {
        draw (poltType, policeType) {
            let flag = false
            const that = this
            this.policeType = ''
            plot && plot.draw(type, overlay => {
            plot && plot.draw(poltType, overlay => {

                if (type == 'billboard') {
                if (poltType == 'billboard' && policeType == 'policeman') {
                    overlay.icon = '/img/policeIcon.png'
                } else if (poltType == 'billboard' && policeType == 'policecar') {
                    overlay.icon = '/img/policeCar.png'
                }

                if (overlay) {
@@ -763,7 +774,7 @@
                    plot.edit(overlay, (e) => {
                        flag = true
                        overlay.on(global.DC.MouseEventType.CLICK, this.overlayTypeClick)
                        overlay.drawType = type
                        overlay.drawType = poltType
                        this.overlayObj = overlay
                        document.oncontextmenu = function () {
                            if (flag == true) {

 src/views/home/components/bottomContainer.vue

@@ -3,12 +3,28 @@
        <div class="header">
            <div class="bottom-title">警情动态</div>
            <div class="history-tab">
                <span class="beforetime" :class="{ choosed: historytype == 0 }" @click="historyTabClick(0)">实时</span>
                <span class="beforetime" :class="{ choosed: historytype == 1 }" @click="historyTabClick(1)">历史</span>
                <span
                    class="beforetime"
                    :class="{ choosed: historytype == 0 }"
                    @click="historyTabClick(0)"
                >实时</span>
                <span
                    class="beforetime"
                    :class="{ choosed: historytype == 1 }"
                    @click="historyTabClick(1)"
                >历史</span>
            </div>
            <div class="timeTab" v-show="historytype">
                <span class="beforetime" :class="{ choosed: timetype == 0 }" @click="timeTabClick(0)">周</span>
                <span class="beforetime" :class="{ choosed: timetype == 1 }" @click="timeTabClick(1)">月</span>
                <span
                    class="beforetime"
                    :class="{ choosed: timetype == 0 }"
                    @click="timeTabClick(0)"
                >周</span>
                <span
                    class="beforetime"
                    :class="{ choosed: timetype == 1 }"
                    @click="timeTabClick(1)"
                >月</span>
            </div>
        </div>

@@ -26,11 +42,17 @@
                    <span class="callContent">报警内容</span>
                </li>
            </ul>
            <vue-seamless-scroll :data="historytype == 0 ? policeSituationRealtimeArr : policeSituationHistoryArr"
                class="warp">
            <vue-seamless-scroll
                :data="historytype == 0 ? policeSituationRealtimeArr : policeSituationHistoryArr"
                class="warp"
            >
                <ul class="item">
                    <li v-for="(item, index) in (historytype == 0 ? policeSituationRealtimeArr : policeSituationHistoryArr)"
                        :key="index" :data-obj="JSON.stringify(item)" class="row">
                    <li
                        v-for="(item, index) in (historytype == 0 ? policeSituationRealtimeArr : policeSituationHistoryArr)"
                        :key="index"
                        :data-obj="JSON.stringify(item)"
                        class="row"
                    >
                        <!-- <span class="num" v-text="item.num"></span> -->
                        <span class="num" v-text="index + 1"></span>
                        <span class="type" v-text="item.type"></span>
@@ -236,7 +258,7 @@
            }

            .beforetime {
                color: #99CCCC;
                color: #99cccc;
                cursor: pointer;
            }

@@ -262,7 +284,7 @@
            }

            .beforetime {
                color: #99CCCC;
                color: #99cccc;
                cursor: pointer;
            }

@@ -339,12 +361,12 @@
            }

            li:nth-child(2n) {
                background: $table-body-tr-2n-color;
                background: rgba(20, 50, 123, 1);
                color: #fff !important;
            }

            li:nth-child(2n-1) {
                background: $table-body-tr-n-color;
                background: rgba(29, 38, 105, 1);
                color: #fff;
            }
        }