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

guanqb

2023-02-28 6ff9bf8cffefc6045a1a288df413aa69b59f0bbf

 src/components/map/components/mapPopup.vue

@@ -21,14 +21,8 @@
                                    <div class="close" @click="closePopup" title="关闭"></div>
                                </div>
                                <div class="change-btn" v-show="detailsPopup.showBtn">
                                    <div
                                        @click="currentBtn = '接警信息'"
                                        :class="{ on: currentBtn == '接警信息' }"
                                    >接警信息</div>
                                    <div
                                        @click="currentBtnChange('出警信息')"
                                        :class="{ on: currentBtn == '出警信息' }"
                                    >出警信息</div>
                                    <div @click="currentBtn = '接警信息'" :class="{ on: currentBtn == '接警信息' }">接警信息</div>
                                    <div @click="currentBtnChange('出警信息')" :class="{ on: currentBtn == '出警信息' }">出警信息</div>
                                </div>

                                <div v-show="currentBtn == '接警信息'" class="label-content">
@@ -70,10 +64,7 @@
                                    </div>
                                </div>

                                <div
                                    v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'"
                                    class="label-content"
                                >
                                <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'" class="label-content">
                                    <div class="item">
                                        <div>处警单位:</div>
                                        <div>{{ CJdata.CJDWMC }}</div>
@@ -112,10 +103,8 @@
                                    </div>
                                </div>

                                <div
                                    v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
                                    class="label-content no-data"
                                >暂无数据</div>
                                <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
                                    class="label-content no-data">暂无数据</div>
                            </div>
                        </div>
                        <div class="b-t-l"></div>
@@ -195,10 +184,12 @@
        },

        popupDetailShow () {
            if (this.detailsPopup.showBtn == true) {
                this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup)
            if (this.detailsPopup.openMenu != '' && this.detailsPopup.openMenu == 'policeInfor') {
                this.$EventBus.$emit('PoliceInforSiteClick', this.dataPopup)
            } else {
                this.$EventBus.$emit('housingPoliceSiteClick', this.dataPopup)
                this.detailsPopup.showBtn == true ?
                    this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup) :
                    this.$EventBus.$emit('housingPoliceSiteClick', this.dataPopup)
            }
        }
    }
@@ -228,20 +219,16 @@
}

.divForms-theme .area {
    background-image: linear-gradient(
            135deg,
    background-image: linear-gradient(135deg,
            transparent 30px,
            #1831a79a 30px,
            #3f487ba6 50%,
            transparent 50%
        ),
        linear-gradient(
            -45deg,
            transparent 50%),
        linear-gradient(-45deg,
            transparent 30px,
            #1831a79a 30px,
            #3f487ba6 50.1%,
            transparent 50%
        );
            transparent 50%);
}

.divForms .area {
@@ -334,14 +321,14 @@
        align-items: center;
        justify-content: space-around;

        & > div {
        &>div {
            width: 36%;
            height: 36px;
            line-height: 36px;
            cursor: pointer;
        }

        & > div.on {
        &>div.on {
            color: #3d95f3;
            border-bottom: 2px solid #3d95f3;
        }
@@ -359,7 +346,7 @@
            margin: 0 10px;
            text-align: left;

            & > div:first-child {
            &>div:first-child {
                width: 112px;
                text-align: justify;
                display: inline-block;
@@ -367,7 +354,7 @@
                margin-right: 20px;
            }

            & > div:nth-of-type(2) {
            &>div:nth-of-type(2) {
                width: calc(100% - 120px);
                max-width: 190px;
                overflow: hidden;