guanqb
2023-10-11 06e4283c69f15c621c5592f2f9aad3cc78f7d675
酒店弹窗需求修改、大屏页面加版权信息
6 files modified
201 ■■■■ changed files
src/components/map/components/hotelPopup.vue 121 ●●●●● patch | view | raw | blame | history
src/components/map/index.vue 3 ●●●●● patch | view | raw | blame | history
src/views/home/components/leftContainer.vue 11 ●●●●● patch | view | raw | blame | history
src/views/home/index.vue 26 ●●●● patch | view | raw | blame | history
src/views/layout/index.vue 38 ●●●●● patch | view | raw | blame | history
src/views/login/index.vue 2 ●●● patch | view | raw | blame | history
src/components/map/components/hotelPopup.vue
@@ -14,7 +14,7 @@
            <div style="width: 100%; height: 100%; transform: translate(0, 50%);">
                <div class="divForms divForms-theme" :class="{ 'scale-dom': scaleDomFlag }">
                    <div class="divForms-wrap">
                        <div class="area">
                        <div class="area" :class="{ 'area-plus': isShowAll }">
                            <div class="arrow-lt"></div>
                            <div class="b-t"></div>
                            <div class="b-r"></div>
@@ -29,102 +29,104 @@
                                <div class="lable-box">
                                    <div class="label-content">
                                        <div class="item">
                                            <div>旅馆代码:</div>
                                            <div>旅馆代码</div>:
                                            <div>{{ hotelPopupData.hotelCode }}</div>
                                        </div>
                                        <div class="item">
                                            <div>旅馆名称:</div>
                                            <div>旅馆名称</div>:
                                            <div>{{ hotelPopupData.hotelName }}</div>
                                        </div>
                                        <div class="item">
                                            <div>状态:</div>
                                            <div>{{ hotelPopupData.status == 1 ? '开业' : '停业' }}</div>
                                        </div>
                                        <div class="item">
                                            <div>备案时间:</div>
                                            <div>{{ hotelPopupData.filingTime }}</div>
                                        </div>
                                        <div class="item">
                                            <div>法人:</div>
                                            <div>法人</div>:
                                            <div>{{ hotelPopupData.legalRepresentative }}</div>
                                        </div>
                                        <div class="item">
                                            <div>法人身份证号:</div>
                                            <div>法人身份证号</div>:
                                            <div>{{ hotelPopupData.legalRepresentativeCard }}</div>
                                        </div>
                                        <div class="item">
                                            <div>负责人:</div>
                                            <div>{{ hotelPopupData.principal }}</div>
                                        </div>
                                        <div class="item">
                                            <div>前台经理:</div>
                                            <div>{{ hotelPopupData.receptionManager }}</div>
                                        </div>
                                        <div class="item">
                                            <div>法人电话:</div>
                                            <div>法人电话</div>:
                                            <div>{{ hotelPopupData.legalRepresentativePhone }}</div>
                                        </div>
                                        <div class="item">
                                            <div>总台电话:</div>
                                            <div>负责人</div>:
                                            <div>{{ hotelPopupData.principal }}</div>
                                        </div>
                                        <div class="item">
                                            <div>总台电话</div>:
                                            <div>{{ hotelPopupData.receptionTel }}</div>
                                        </div>
                                        <div class="item">
                                            <div>保安部电话:</div>
                                            <div>{{ hotelPopupData.securityTel }}</div>
                                        </div>
                                        <div class="item">
                                            <div>旅馆地址:</div>
                                            <div>{{ hotelPopupData.hotelAddress }}</div>
                                        </div>
                                    </div>
                                    <div class="label-content">
                                        <div class="item">
                                            <div>治安负责人:</div>
                                            <div>治安负责人</div>:
                                            <div>{{ hotelPopupData.publicSecurityPrincipal }}</div>
                                        </div>
                                        <div class="item">
                                            <div>保安人数:</div>
                                            <div>保安部电话</div>:
                                            <div>{{ hotelPopupData.securityTel }}</div>
                                        </div>
                                        <div class="item">
                                            <div>旅馆地址</div>:
                                            <div>{{ hotelPopupData.hotelAddress }}</div>
                                        </div>
                                        <div class="item">
                                            <div>状态</div>:
                                            <div>{{ hotelPopupData.status == 1 ? '开业' : '停业' }}</div>
                                        </div>
                                    </div>
                                    <el-button :icon="isShowAll ? 'el-icon-arrow-left' : 'el-icon-arrow-right'"
                                        class="open-btn" type="primary" @click="openAll"></el-button>
                                    <div class="label-content" v-show="isShowAll">
                                        <div class="item">
                                            <div>前台经理</div>:
                                            <div>{{ hotelPopupData.receptionManager }}</div>
                                        </div>
                                        <div class="item">
                                            <div>保安人数</div>:
                                            <div>{{ hotelPopupData.securityNum }}</div>
                                        </div>
                                        <div class="item">
                                            <div>从业人数:</div>
                                            <div>从业人数</div>:
                                            <div>{{ hotelPopupData.getJobNum }}</div>
                                        </div>
                                        <div class="item">
                                            <div>外来打工人数:</div>
                                            <div>外来打工人数</div>:
                                            <div>{{ hotelPopupData.migrantWorkNum }}</div>
                                        </div>
                                        <div class="item">
                                            <div>房间数:</div>
                                            <div>房间数</div>:
                                            <div>{{ hotelPopupData.roomNum }}</div>
                                        </div>
                                        <div class="item">
                                            <div>床位数:</div>
                                            <div>床位数</div>:
                                            <div>{{ hotelPopupData.bed }}</div>
                                        </div>
                                        <div class="item">
                                            <div>星级:</div>
                                            <div>星级</div>:
                                            <div>{{ hotelPopupData.starLevel }}</div>
                                        </div>
                                        <div class="item">
                                            <div>套房:</div>
                                            <div>套房</div>:
                                            <div>{{ hotelPopupData.suite }}</div>
                                        </div>
                                        <div class="item">
                                            <div>标准房:</div>
                                            <div>标准房</div>:
                                            <div>{{ hotelPopupData.standard }}</div>
                                        </div>
                                        <div class="item">
                                            <div>双人房:</div>
                                            <div>双人房</div>:
                                            <div>{{ hotelPopupData.two }}</div>
                                        </div>
                                        <div class="item">
                                            <div>单人房:</div>
                                            <div>单人房</div>:
                                            <div>{{ hotelPopupData.one }}</div>
                                        </div>
                                        <div class="item">
                                            <div>其他房型:</div>
                                            <div>其他房型</div>:
                                            <div>{{ hotelPopupData.rests }}</div>
                                        </div>
                                        <div class="item">
                                            <div>备案时间</div>:
                                            <div>{{ hotelPopupData.filingTime }}</div>
                                        </div>
                                    </div>
                                </div>
@@ -151,7 +153,8 @@
    data () {
        return {
            scaleDomFlag: false
            scaleDomFlag: false,
            isShowAll: false
        }
    },
@@ -174,6 +177,11 @@
    methods: {
        closePopup () {
            this.$store.commit('SET_HOTELPOPUP', false)
        },
        openAll () {
            this.isShowAll = !this.isShowAll
            console.log('this.isShowAll.', this.isShowAll)
        },
    }
}
@@ -216,8 +224,12 @@
.divForms .area {
    position: relative;
    // min-width: 360px;
    min-width: 720px;
    min-width: 360px;
}
.divForms .area-plus {
    position: relative;
    min-width: 740px;
}
.divForms-wrap {
@@ -322,7 +334,7 @@
        display: flex;
        .label-content {
            width: 50%;
            // width: 50%;
            padding: 10px 0;
            .item {
@@ -364,13 +376,20 @@
        }
        .label-content:nth-of-type(1) .item:nth-last-child(1) {
        .open-btn {
            border: 0;
            background-color: transparent;
            width: 20px;
            padding: 0;
        }
        .label-content:nth-of-type(1) .item:nth-of-type(10) {
            height: 90px;
            &>div:nth-of-type(2) {
                word-wrap: break-word;
                white-space: break-spaces;
                width: 190px;
                // width: 190px;
            }
        }
    }
src/components/map/index.vue
@@ -11,6 +11,9 @@
<template>
    <div class="viewer-box" id="viewer-container" @click="showImgBtn = false">
        <slot ref="mainContent" name="mainContent"></slot>
        <slot name="copyrightText"></slot>
        <slot name="showButton"></slot>
        <div class="compass-btn">
src/views/home/components/leftContainer.vue
@@ -232,7 +232,8 @@
            getHotelList({ deptId: this.$parent.areaChangeValue, orderName: 'hotel_name', hotelName: this.$parent.zhuSuName, orderRule: 'asc', size: this.$parent.zhuSuPage.pageSize, current: this.$parent.zhuSuPage.currentPage }).then(res => {
                console.log(res.data.data.records, 'getHotelList-1234')
                this.$parent.zhuSuPage.total = res.data.data.total
                this.$parent.zhuSuArr = res.data.data.records
                //开业在前面排序
                this.$parent.zhuSuArr = res.data.data.records.sort((x, y) => (x.status > y.status) ? -1 : (x.status < y.status) ? 1 : 0)
                setTimeout(() => {
                    this.$parent.zhuSuLoading = false
                }, 500)
@@ -1127,6 +1128,10 @@
                    } else {
                        this.$store.commit('SET_HOTELPOPUP', false)//关闭酒店地图详情弹窗
                        this.$EventBus.$emit("mapClearLayer", {//清除酒店地图图标
                            layerName: "jiudianLayer",
                            type: "VectorLayer",
                        })
                        this.$parent.syldPage.currentPage = 1
                        this.$parent.syldPopupTitle = params.name
                        this.syldBigType = params.name
@@ -1140,6 +1145,10 @@
                } else {
                    console.log('关注场所')
                    this.$store.commit('SET_HOTELPOPUP', false)//关闭酒店地图详情弹窗
                    this.$EventBus.$emit("mapClearLayer", {//清除酒店地图图标
                        layerName: "jiudianLayer",
                        type: "VectorLayer",
                    })
                    this.$parent.gzcsPage.currentPage = 1
                    this.gzcsType = params.name
                    this.gzcsUnitName = ''
src/views/home/index.vue
@@ -539,11 +539,10 @@
            <el-table :data="zhuSuArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                <el-table-column :show-overflow-tooltip="true" prop="hotelCode" label="旅馆代码"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="hotelName" label="旅馆名称"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="legalRepresentative" label="法定代表人"
                <el-table-column :show-overflow-tooltip="true" prop="legalRepresentative" label="法人"
                    width="100"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="legalRepresentativePhone" label="法定代表人电话"
                    width="120"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="receptionTel" label="总台电话"
                    width="120"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="hotelAddress" label="旅馆地址"></el-table-column>
@@ -1127,6 +1126,7 @@
        // 关注场所点击事件
        gzcsRowClick (row) {
            console.log('gzcsRowClick', row)
            console.log('gzcsRowClick', row)
            this.$EventBus.$emit('toPosition', {
                siteJd: row.longitude,
                siteWd: row.latitude,
@@ -1151,11 +1151,24 @@
        // 实有楼栋---酒店--点击事件
        zhuSuClick (row) {
            console.log('zhuSuClick', row)
            this.$EventBus.$emit('toPosition', {
                siteJd: row.longitude,
                siteWd: row.latitude,
                siteGd: 200
            })
            this.$EventBus.$emit("mapClearLayer", {
                layerName: "deepDataLayer",
                type: "VectorLayer",
            })
            this.$EventBus.$emit("layerPointAdd", {
                layerName: "jiudianLayer",
                type: "billboard",
                params: {
                    lng: `${row.longitude}`,
                    lat: `${row.latitude}`,
                    alt: 1,
                    url: "/img/icon/business.png",
                },
            })
            this.$store.commit('SET_HOTELPOPUP', true)
            this.$store.commit('SET_HOTELPOPUPDATA', { ...row })
@@ -2765,6 +2778,11 @@
            type: 'VectorLayer'
        })
        this.$EventBus.$emit("mapClearLayer", {
            layerName: "jiudianLayer",
            type: "VectorLayer",
        })
        if (cylinderLayer != null) {
            cylinderLayer.remove()
            cylinderLayer = null
src/views/layout/index.vue
@@ -92,6 +92,17 @@
                    <router-view ref="target-name"></router-view>
                </div>
                <div slot="copyrightText">
                    <div class="copyright-box" v-show="!this.$store.state.popupParams.isShowHomeContent">版权所有:上饶市公安局信州分局
                        <br />技术支持:上饶市公安局信州分局科信大队
                    </div>
                    <div :class="{ 'copyright-box-shouye': isShouYe, 'copyright-box': !isShouYe, }"
                        v-show="this.$store.state.popupParams.isShowHomeContent">
                        版权所有:上饶市公安局信州分局
                        <br />技术支持:上饶市公安局信州分局科信大队
                    </div>
                </div>
                <el-button slot="showButton" v-show="leftShow" class="flexible-btn"
                    :class="{ 'spread': leftShow && show, 'take-back': leftShow && !show }"
                    :icon="show ? 'el-icon-arrow-left' : 'el-icon-arrow-right'" id="FlexibleBtn" type="primary"
@@ -188,6 +199,7 @@
            refreshLock: false,
            //刷新token的时间
            refreshTime: "",
            isShouYe: true,
        }
    },
@@ -257,6 +269,11 @@
         */
        goToPath (params) {
            console.log(params, 215555)
            if (params.menuName == '首页') {
                this.isShouYe = true
            } else {
                this.isShouYe = false
            }
            if (params.path) {
                if (this.$route.path == params.path) return
@@ -602,6 +619,27 @@
        .main-content.take-back {
            width: 0px;
        }
        .copyright-box {
            position: fixed;
            bottom: 1%;
            right: 1%;
            color: #fff;
            font-size: 14px;
            text-align: left;
            z-index: 9;
        }
        .copyright-box-shouye {
            position: absolute;
            bottom: calc(380 / 1080 * 100vh);
            right: calc(400 / 1920 * 100vw);
            color: #fff;
            font-size: 14px;
            text-align: left;
            z-index: 9;
        }
    }
}
src/views/login/index.vue
@@ -49,7 +49,7 @@
            </el-form>
        </div>
        <div class="copyright-box">
            版权所有:上饶市公安局信州分局 &nbsp;&nbsp;技术支持:上饶市公安局信州分局科信大队
            版权所有:上饶市公安局信州分局 <br />技术支持:上饶市公安局信州分局科信大队
        </div>
    </div>
</template>