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

guanqb

2022-09-21 5310f36bf16a60d8c560ed5684b6ea5c837fff05

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

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-20 17:19:17
 * @LastEditTime: 2022-09-21 10:13:38
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -350,7 +350,7 @@
        })

        this.$EventBus.$on('flyToPosition', (params) => {
            that.flyToPosition(params.siteJd, params.siteWd, params.siteGd = 2000, params.siteHeading = 0, params.sitePitch = -90, params.siteRoll = 0, params.time = 3)
            that.flyToPosition(params.siteJd, params.siteWd, params.siteGd, params.siteHeading, params.sitePitch, params.siteRoll, params.time)
        })


@@ -363,9 +363,21 @@
            // eslint-disable-next-line no-unused-vars
            that.removeMxTileset(params.titlesetName, params.incident)
        })

        this.$EventBus.$emit('addMxTileset', {
            titlesetName: 'sdOrrTilesetLayer',
            titlesetUrl: "/sd/tileset.json",
            incident: this.tilesetClick
        })
    },

    methods: {
        // 模型的点击事件
        tilesetClick (e) {
            if (this.$route.path != "/lyout/house") {
                this.$router.push({ path: '/lyout/house', query: { searchName: 'xxx小区' } })
            }
        },
        /**
         * @description: 全屏控制
         * @return {*} 无返回值
@@ -560,7 +572,7 @@
         * @param {*} siteRoll 翻转角度，默认0
         * @param {*} time 飞行时间，默认3秒
         */
        flyToPosition (siteJd, siteWd, siteGd, siteHeading, sitePitch, siteRoll, time) {
        flyToPosition (siteJd, siteWd, siteGd = 2000, siteHeading = 0, sitePitch = -90, siteRoll = 0, time = 3) {
            global.viewer.flyToPosition(
                new global.DC.Position(
                    Number(siteJd),
@@ -598,7 +610,9 @@

            tilesetLayer.addOverlay(tilesetObject[titlesetName])

            global.viewer.flyTo(tilesetObject[titlesetName])
            // global.viewer.flyTo(tilesetObject[titlesetName])

            this.flyToPosition(116.027212, 28.678499, 600, -3, -45)

            tilesetObject[titlesetName].on(global.DC.MouseEventType.CLICK, incident)
        },

 src/styles/base/index.scss

@@ -50,8 +50,18 @@

.car-video-box {
    .el-dialog {
        left: auto !important;
        right: 240px;
        margin: 0 !important;
        display: flex;
        flex-direction: column;
        width: 720px;
        height: 480px;
        top: 50%;
        left: 50% !important;
        transform: translate(-50%, -50%);

        .el-dialog__body {
            flex: 1;
        }
    }
}


 src/styles/dc/index.scss

@@ -7,27 +7,4 @@
    .scale-bar {
        border-color: #000 !important;
    }
}

.car-video-box .el-dialog {
    margin-top: 0 !important;
    position: fixed !important;
    top: 200px;
    left: 400px;
    // right: 0;
    // bottom: 0;
    // margin: auto;
  
    width: 821px;
    height: 450px;
  
    .el-dialog__body {
      padding: 10px !important;
      height: calc(100% - 50px);
  
      iframe {
        width: 100%;
        height: 100%;
      }
    }
  }
}

 src/views/activity/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-19 17:42:50
 * @LastEditTime: 2022-09-21 10:03:28
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -360,10 +360,10 @@
        // height: 70%;
        color: #fff;
        background: rgba(7, 22, 37, 0.8);
        ::v-deep .el-tree-node__content {
        :deep(.el-tree-node__content) {
            background: transparent;
        }
        ::v-deep .el-tree-node {
        :deep(.el-tree-node) {
            background: #0f1e2d;
        }
    }

 src/views/home/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-20 17:22:42
 * @LastEditTime: 2022-09-21 12:03:05
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -68,6 +68,7 @@
                <div id="EquipmentEcharts" class="echarts-box"></div>
            </div>
        </div>

        <div class="right-container">
            <div class="case-box">
                <div class="title">
@@ -129,6 +130,7 @@
                <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
            </div>
        </div>

        <div class="top-container">
            <div class="selectBox">
                <div class="choose" v-if="oneSelected==''">请选择</div>
@@ -149,6 +151,48 @@
                </select>
            </div>
        </div>

        <el-dialog
            :title="dialogTitle"
            :modal="true"
            :visible.sync="dialogVisible"
            :before-close="dialogBeforeClose"
            :close-on-click-modal="true"
            class="car-video-box"
        >
            <div
                style="display: flex; align-items: center; justify-content: center; width: 100%; height: 100%;"
            >
                <video
                    src="/video/sp.mp4"
                    autoplay
                    controls
                    width="100%"
                    height="100%"
                    ref="videoElement"
                    style="object-fit: fill"
                ></video>
            </div>
        </el-dialog>

        <el-dialog
            :title="panoramaTitle"
            :modal="true"
            :visible.sync="panoramaVisible"
            :before-close="panoramaBeforeClose"
            :close-on-click-modal="true"
            class="car-video-box"
        >
            <div
                style="display: flex; align-items: center; justify-content: center; width: 100%; height: 100%;"
            >
                <iframe
                    src="http://vr.jxpskj.com/JXSFKZQJ/QJ/"
                    style="width: 100%; height: 100%;"
                    frameborder="0"
                ></iframe>
            </div>
        </el-dialog>
    </div>
</template>

@@ -162,72 +206,79 @@
            phoneLayerShow: false,
            monitoringLayerShow: false,
            panoramaLayerShow: false,
            dialogTitle: '',
            dialogVisible: false,
            panoramaTitle: '',
            panoramaVisible: false,

            carList: [{
                name: '1号警车',
                lng: 115.998703,
                lat: 28.691435,
                lng: 116.022877,
                lat: 28.685077,
                alt: 100,
                url: '/img/icon/car.png'
            }, {
                name: '2号警车',
                lng: 115.984703,
                lat: 28.673435,
                lng: 116.029917,
                lat: 28.685360,
                alt: 100,
                url: '/img/icon/car.png'
            }, {
                name: '3号警车',
                lng: 116.009054,
                lat: 28.674692,
                lng: 116.031044,
                lat: 28.679445,
                alt: 100,
                url: '/img/icon/car.png'
            }],

            phoneList: [{
                name: '1号手台',
                lng: 116.007370,
                lat: 28.662075,
                lng: 116.026804,
                lat: 28.678568,
                alt: 100,
                url: '/img/icon/phone.png'
            }, {
                name: '2号手台',
                lng: 116.033595,
                lat: 28.702225,
                lng: 116.027659,
                lat: 28.678623,
                alt: 100,
                url: '/img/icon/phone.png'
            }, {
                name: '3号手台',
                lng: 115.99685299,
                lat: 28.70599572,
                lng: 116.026759,
                lat: 28.680071,
                alt: 100,
                url: '/img/icon/phone.png'
            }],

            monitoringList: [{
                name: '1号监控',
                lng: 116.025398,
                lat: 28.663066,
                lng: 116.026984,
                lat: 28.682241,
                alt: 100,
                url: '/img/icon/video.png'
            }, {
                name: '2号监控',
                lng: 116.0145001,
                lat: 28.694361,
                lng: 116.021069,
                lat: 28.678791,
                alt: 100,
                url: '/img/icon/video.png'
            }, {
                name: '3号监控',
                lng: 116.018293,
                lat: 28.624986,
                lng: 116.031208,
                lat: 28.684966,
                alt: 100,
                url: '/img/icon/video.png'
            }],

            panoramaList: [{
                name: '1号全景',
                lng: 116.027002,
                lat: 28.683302,
                lng: 116.027625,
                lat: 28.677213,
                alt: 100,
                url: '/img/icon/map-panorama.png'
            }],

            arr: [{ 'type': '孤寡老人', 'num': '0', 'radio': '0.00%' }, { 'type': '邪教人员', 'num': '1', 'radio': '2.00%' }, { 'type': '上访人员', 'num': '8', 'radio': '14.00%' }, { 'type': '涉毒', 'num': '15', 'radio': '27.00%' }, { 'type': '留守儿童', 'num': '6', 'radio': '11.00%' }, { 'type': '重点青少年', 'num': '5', 'radio': '9.00%' }],
            chooseData: {},
            oneSelected: '',
@@ -662,7 +713,8 @@
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'carLayers',
                        type: "billboard",
                        params: item
                        params: item,
                        incident: this.siteClick
                    })
                })
            } else {
@@ -696,7 +748,8 @@
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'monitoringLayers',
                        type: "billboard",
                        params: item
                        params: item,
                        incident: this.siteClick
                    })
                })
            } else {
@@ -713,7 +766,8 @@
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'panoramaLayers',
                        type: "billboard",
                        params: item
                        params: item,
                        incident: this.panoramaSiteClick
                    })
                })
            } else {
@@ -725,22 +779,46 @@
        },

        getChooseData () {
            let arr1 = ['一区', '二区', '三区']
            let arr2 = ['1所', '2所', '3所']
            let arr1 = ['信州区车站派出所', '信州区沙溪派出所', '信州区灵溪派出所', '信州区北门派出所', '信州区江光派出所', '信州区水南派出所', '信州区秦峰派出所', '信州区茅家岭派出所', '信州区西市派出所', '信州区朝阳派出所']
            let arr2 = ['辖区1', '辖区2', '辖区3', '辖区4', '辖区5', '辖区6', '辖区7', '辖区8']
            let arr3 = ['A小区', 'B小区', 'C小区']
            var obj = {}
            for (let i = 0; i < 3; i++) {
            for (let i = 0; i < arr1.length; i++) {
                obj[arr1[i]] = {}
                for (let j = 0; j < 3; j++) {
                for (let j = 0; j < arr2.length; j++) {
                    let str = arr1[i] + arr2[j]
                    console.log('str', str)
                    obj[arr1[i]][str] = []
                    for (let k = 0; k < 3; k++) {
                    for (let k = 0; k < arr3.length; k++) {
                        obj[arr1[i]][str].push(str + arr3[k])
                    }
                }
            }
            this.chooseData = obj
        },

        siteClick (e) {
            this.dialogTitle = e.overlay.attrParams.name
            this.dialogVisible = true

            if (this.$refs.videoElement && this.$refs.videoElement != null) {
                this.$refs.videoElement.currentTime = 0
                this.$refs.videoElement.play()
            }
        },

        dialogBeforeClose () {
            this.$refs.videoElement.pause()
            this.dialogVisible = false
        },

        panoramaSiteClick (e) {
            this.panoramaTitle = e.overlay.attrParams.name
            this.panoramaVisible = true
        },

        panoramaBeforeClose () {
            this.panoramaVisible = false
        }
    },
    watch: {
@@ -755,6 +833,12 @@
                this.houseLayerShow = true
                this.houseChange(this.houseLayerShow)
            }

            this.$EventBus.$on('flyToPosition', {
                siteJd: 116.026912,
                siteWd: 28.683599,
                siteGd: 400
            })
        },
    },


 src/views/lyout/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-17 11:56:45
 * @LastEditTime: 2022-09-21 10:42:58
 * @FilePath: \srs-police-affairs\src\views\lyout\index.vue
 * @Description: 
 *