部分内容完善

shuishen

2022-01-20 684d74d2285092559b5d25fac451e4f1abb52a5b

部分内容完善

 src/api/pc/public/arc.js

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-05-09 15:17:44
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-24 11:30:06
 * @Last Modified time: 2022-01-20 16:36:28
 */
// 校区
import request from '@/router/axios'
@@ -38,3 +38,11 @@
        params: params
    })
}

export const getDetail = (params) => {
    return request({
        url: '/blade-architecture/architecture/detail',
        method: 'get',
        params: params
    })
}

 src/components/arcNavBar/index.vue

@@ -180,8 +180,6 @@
                this.$store.commit('CLEAR_ALL', null)

                var imgArr = result.tpurl.split(',')
                var tabOne = res.data.data[0].jx.split(',')
                var tabTwo = res.data.data[0].sh.split(',')

                this.$store.commit('SET_POPUPBGURL', imgArr[0])
                this.$store.commit('SET_POPUPQRURL', result.codeurl)
@@ -195,13 +193,15 @@
                if (result.videourl && result.videourl != '') {
                    this.$store.commit('SET_MONITORURL', result.videourl)
                }
                if (res.data.data[0].jx != '') {
                if (res.data.data[0].jx != undefined && res.data.data[0].jx != '') {
                    var tabOne = res.data.data[0].jx.split(',')
                    this.$store.commit('SET_TEACHLIST', tabOne)
                } else {
                    this.$store.commit('SET_TEACHLIST', [])
                }

                if (res.data.data[0].sh != '') {
                if (res.data.data[0].sh != undefined && res.data.data[0].sh != '') {
                    var tabTwo = res.data.data[0].sh.split(',')
                    this.$store.commit('SET_LIVELIST', tabTwo)
                } else {
                    this.$store.commit('SET_LIVELIST', [])

 src/components/leftNav/index.vue

@@ -23,9 +23,9 @@
        return {
            leftNavData: [
                {
                    flag: false,
                    flag: true,
                    label: '标签',
                    img: '/img/leftnav/tag.png',
                    img: '/img/leftnav/tag-checked.png',
                    normal: '/img/leftnav/tag.png',
                    checked: '/img/leftnav/tag-checked.png',
                    layer: 'tagLayer'
@@ -162,7 +162,7 @@

                    this.tagLayer.addOverlay(divIcon)
                })
                this.tagLayer.show = false
                // this.tagLayer.show = false
            })

            getWayList().then(res => {

 src/components/map/components/campusBuildingSearch.vue

@@ -233,8 +233,6 @@
            var result = param.list

            var imgArr = result.tpurl.split(',')
            var tabOne = param.jx.split(',')
            var tabTwo = param.sh.split(',')

            this.$store.commit('SET_POPUPBGURL', imgArr[0])
            this.$store.commit('SET_POPUPQRURL', result.codeurl)
@@ -250,13 +248,15 @@
                this.$store.commit('SET_MONITORURL', result.videourl)
            }
            this.$store.commit('SET_POPUPIMGATLAS', imgArr)
            if (param.jx != '') {
            if (param.jx != undefined && param.jx != '') {
                var tabOne = param.jx.split(',')
                this.$store.commit('SET_TEACHLIST', tabOne)
            } else {
                this.$store.commit('SET_TEACHLIST', [])
            }

            if (param.sh != '') {
            if (param.sh != undefined && param.sh != '') {
                var tabTwo = param.sh.split(',')
                this.$store.commit('SET_LIVELIST', tabTwo)
            } else {
                this.$store.commit('SET_LIVELIST', [])

 src/components/map/components/dimension copy.vue

File was deleted

 src/components/map/components/dimension.vue

@@ -13,6 +13,7 @@

import axios from 'axios'
import { mapGetters } from 'vuex'
import { getDetail } from '@/api/pc/public/arc'

export default {
    name: 'dimension',
@@ -390,30 +391,53 @@

                    that.viewer.on(that.DC.MouseEventType.CLICK, e => {
                        if (e.overlay != undefined && e.layer.id == 'areaLayer') {
                            that.viewer.scene.globe.depthTestAgainstTerrain = false
                            var rid = e.overlay.attr['楼栋号'] == '8栋' ? '9栋' : e.overlay.attr['楼栋号'] == '9栋' ? '8栋' : e.overlay.attr['楼栋号']
                            getDetail({ mechanismname: '香琴湾' + rid }).then((res) => {
                                that.viewer.scene.globe.depthTestAgainstTerrain = false
                                var result = res.data.data
                                this.$store.commit('CLEAR_ALL', null)

                            that.$store.commit('CLEAR_ALL', null)
                                var imgArr = result.tpurl.split(',')

                            var imgArr = ['http://223.82.109.183:2081/zhxy/upload/20220105/3c05dd70a9eac17b7e49afbfc7b1b68e.png']
                                this.$store.commit('SET_POPUPBGURL', imgArr[0])
                                this.$store.commit('SET_POPUPQRURL', result.codeurl)
                                that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                                this.$store.commit('SET_STATENAME', result.mechanismname)
                                this.$store.commit('SET_SITENAME', result.address)
                                this.$store.commit('SET_TELEPHONE', result.telephone)
                                this.$store.commit('SET_INTRODUCETEXT', result.introduce)
                                this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
                                this.$store.commit('SET_POPUPIMGATLAS', imgArr)
                                if (result.videourl && result.videourl != '') {
                                    this.$store.commit('SET_MONITORURL', result.videourl)
                                }
                                if (result.jx != undefined && result.jx != '') {
                                    var tabOne = res.data.data[0].jx.split(',')
                                    this.$store.commit('SET_TEACHLIST', tabOne)
                                } else {
                                    this.$store.commit('SET_TEACHLIST', [])
                                }

                            that.$store.commit('SET_POPUPBGURL', imgArr[0])
                            that.$store.commit('SET_POPUPQRURL', 'http://223.82.109.183:2081/zhxy/upload/20211222/9c324adea5d9e5b50cd8f874d5f780f4.png')
                            that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                            that.$store.commit('SET_STATENAME', e.overlay.attr['楼栋号'])
                            that.$store.commit('SET_POPUPIMGATLAS', imgArr)
                                if (result.sh != undefined && result.sh != '') {
                                    var tabTwo = res.data.data[0].sh.split(',')
                                    this.$store.commit('SET_LIVELIST', tabTwo)
                                } else {
                                    this.$store.commit('SET_LIVELIST', [])
                                }

                            // 定制化窗体
                            // eslint-disable-next-line no-unused-vars
                            var popup = new that.DC.DivForms(that.viewer, {
                                domId: 'divFormsDomBox',
                                position: [
                                    that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
                                ]
                                // 定制化窗体
                                // eslint-disable-next-line no-unused-vars
                                var popup = new that.DC.DivForms(that.viewer, {
                                    domId: 'divFormsDomBox',
                                    position: [
                                        that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
                                    ]
                                })

                                this.$store.commit('SET_PANORAMAPOPUP', false)
                                this.$store.commit('SET_MONITORPOPUP', false)
                                this.$store.commit('SET_DETAILSPOPUP', true)
                            })

                            this.$store.commit('SET_PANORAMAPOPUP', false)
                            this.$store.commit('SET_MONITORPOPUP', false)
                            this.$store.commit('SET_DETAILSPOPUP', true)
                        }
                    })


 src/components/map/components/mapPopup.vue

@@ -72,7 +72,8 @@
                                                    <i class="popup-icon live-action-nav deblurring"></i>
                                                    实景
                                                </li>
                                                <li v-show="panoramaUrl != null && panoramaUrl != ''"
                                                <!-- v-show="panoramaUrl != null && panoramaUrl != ''" -->
                                                <li v-show="false"
                                                    @click="monitorClick">
                                                    <i class="popup-icon monitor-nav deblurring"></i>
                                                    监控
@@ -426,6 +427,7 @@

            // eslint-disable-next-line new-cap
            var positions = this.DC.Transform.transformWGS84ToCartesian(
                // eslint-disable-next-line new-cap
                new this.DC.Position.fromArray(this.pointPosition)
            )
            this.viewer.scene.globe.depthTestAgainstTerrain = false

 src/styles/entitys/text-entitys.scss

@@ -47,8 +47,7 @@
    }
}
.tag-entitys-box {
    margin-left: 24px;
    margin-bottom: 44px;
    transform: translate(24px, -44px);
    height: 28px;

    .tag-content {
@@ -93,8 +92,7 @@
}

.way-entitys-box {
    margin-left: 8px;
    margin-bottom: 136px;
    transform: translate(8px, -136px);

    .way-title {
        border: white 1px solid;
@@ -115,7 +113,7 @@
}

.park-entitys-box {
    margin-bottom: 26px;
    transform: translate(0, -26px);

    .park-title {
        position: relative;

 src/styles/layout/pc.scss

@@ -44,6 +44,7 @@
            }

            .header-title {
                margin-right: 10px;
                position: relative;
                text-indent: 0.1em;
                font-size: 18px;