配置更改及首页默认警情显示及console.log信息删除

shuishen

2023-02-21 25c5811a0295383c5deb1a94900fbd54c82b359e

配置更改及首页默认警情显示及console.log信息删除

 public/static/config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-02-21 14:16:56
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-21 16:01:45
 * @LastEditTime: 2023-02-21 16:27:46
 * @FilePath: \srs-police-affairs\public\static\config.js
 * @Description: 
 * 
@@ -29,7 +29,7 @@
    VUE_APP_INTRANET_VIDEO: 'http://10.141.11.11:18185/api',

    // 设备通道号
    VUE_APP_OUTER_NET_EQUIPMENT: '34020000002000000003',
    VUE_APP_OUTER_NET_EQUIPMENT: '36110000002009999000',
    VUE_APP_INTRANET_EQUIPMENT: '36110000002009999000',

    // 模型地址

 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: 2023-02-21 16:06:42
 * @LastEditTime: 2023-02-21 16:27:22
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -219,21 +219,21 @@
            that.switchImg()

            // 外网
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
            //         format: 'image/jpeg',
            //         show: true,
            //         maximumLevel: 18
            //     })
            // )
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
                    subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
                    format: 'image/jpeg',
                    show: true,
                    maximumLevel: 18
                })
            )

            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: '/sryx/{z}/{x}/{y}.png',
            //     })
            // )
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: '/sryx/{z}/{x}/{y}.png',
                })
            )

            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({

 src/store/modules/user.js

@@ -77,7 +77,6 @@
        },
        //刷新token
        refreshToken ({ state, commit }, userInfo) {
            window.console.log('handle refresh token')
            return new Promise((resolve, reject) => {
                refreshToken(state.refreshToken, state.tenantId,
                    !validatenull(userInfo) ? userInfo.deptId : state.userInfo.dept_id,

 src/utils/store.js

@@ -32,7 +32,6 @@
    let obj = {},
        content
    obj = window.sessionStorage.getItem(name)
    console.log(obj, 456)
    if (validatenull(obj)) obj = window.localStorage.getItem(name)
    if (validatenull(obj)) return
    try {

 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: 2023-02-14 15:28:15
 * @LastEditTime: 2023-02-21 16:54:00
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 *
@@ -929,7 +929,6 @@
        getPolicemanTree () {
            getPolicemanTree().then(res => {
                this.policeTreeData = res.data.data
                console.log(res.data.data, 121212)
            })
        },

@@ -1185,7 +1184,6 @@
        // 点击选择警员
        handlePoliceNodeClick (current) {
            if (current.hasChildren == true) return
            console.log(current, 1111)
            this.searchPoliceTreeName = current.name
            this.searchPoliceTreeId = current.id
            this.searchTreeShowFlag = false
@@ -1531,7 +1529,6 @@
                        this.overlayObj = overlay
                        document.oncontextmenu = function () {
                            if (flag == true && poltType == 'billboard') {
                                console.log('poltType == billboard', policeType)
                                if (policeType == 'policeman') {
                                    that.policeChooseVisible = true
                                } else if (policeType == 'policecar') {
@@ -1741,7 +1738,6 @@
            if ('policemanId' in e.overlay.attrParams) {
                this.policeIconId = e.overlay.attrParams.id
                this.policeType = e.overlay.attrParams.policemanId
                console.log(e.overlay.attrParams, 9999)
                // let list = this.platFn(res.data.data).find(item => item.id == "1627542311989243905").name
                this.policeIconIsCreated = true
                this.policeChooseVisible = true

 src/views/home/components/bottomContainer.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-01-13 15:52:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-15 16:01:18
 * @LastEditTime: 2023-02-21 16:35:43
 * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
 * @Description: 
 * 
@@ -460,103 +460,105 @@

        // 获取实时接警记录
        getAnswerPolices () {
            getAnswerPolices({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
                this.policeSituationRealtimeArr = []
            // getAnswerPolices({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
            //     this.policeSituationRealtimeArr = []

                if (res.data.result.length > 0) {
                    this.policeSituationRealtimeArr = res.data.result.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                    })
                } else {
                    this.policeSituationRealtimeArr = []
                }
            //     if (res.data.result.length > 0) {
            //         this.policeSituationRealtimeArr = res.data.result.map((item, index) => {
            //             return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            //         })
            //     } else {
            //         this.policeSituationRealtimeArr = []
            //     }

                this.$emit('policeSituationChange')
            //     this.$emit('policeSituationChange')
            // })

            this.policeSituationRealtimeArr = [{
                ZDDWXZB: 117.97,
                ZDDWYZB: 28.45,
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            }]

            this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            })

            // this.policeSituationRealtimeArr = [{
            //     ZDDWXZB: 112,
            //     ZDDWYZB: 25,
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // }]

            // this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            // })
            this.$emit('policeSituationChange')
        },

        // 获取历史接警记录

 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: 2023-02-21 15:54:27
 * @LastEditTime: 2023-02-21 16:52:21
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -695,7 +695,7 @@
            cameraLayerShow: false,
            monitoringLayerShow: false,
            panoramaLayerShow: false,
            policeSituationLayerShow: false,
            policeSituationLayerShow: true,
            panoramaTitle: '',
            panoramaVrUrl: '',
            equimentTitle: '',
@@ -733,7 +733,7 @@
                name: '1号全景',
                lng: 116.027625,
                lat: 28.677213,
                alt: 100,
                alt: 1,
                url: '/img/icon/map-panorama.png'
            }],
            activityList: [],
@@ -898,7 +898,7 @@
                            params: {
                                lng: positionArr[0],
                                lat: positionArr[1],
                                alt: 50,
                                alt: 1,
                                url: '/img/icon/house.png',
                                id: item.id
                            },
@@ -983,7 +983,7 @@
                let position = []
                res.data.data.forEach(item => {
                    position = JSON.parse(item.geom).coordinates
                    this.houseList.push({ name: `${item.aoi_name}`, lng: `${position[0]}`, lat: `${position[1]}`, alt: 200, url: '/img/icon/house.png' })
                    this.houseList.push({ name: `${item.aoi_name}`, lng: `${position[0]}`, lat: `${position[1]}`, alt: 1, url: '/img/icon/house.png' })
                })
                this.houseChange(true)
            })
@@ -1127,7 +1127,7 @@
                                    ...item,
                                    lng: item.longitude,
                                    lat: item.latitude,
                                    alt: 100,
                                    alt: 1,
                                    url: '/img/icon/car.png'
                                },
                                incident: this.phoneSiteClick
@@ -1156,7 +1156,7 @@
                                    ...item,
                                    lng: item.longitude,
                                    lat: item.latitude,
                                    alt: 100,
                                    alt: 1,
                                    url: '/img/icon/camera.png'
                                },
                                incident: this.siteClick
@@ -1210,13 +1210,16 @@
            }
        },

        policeSituationChange () {
            this.policeSituationSelectChange()
            circleLayer.clear()
            circleLayer.remove()
            circleLayer = null
            circleLayer = new global.DC.PrimitiveLayer('circleLayer')
            global.viewer.addLayer(circleLayer)
        async policeSituationChange () {
            await this.policeSituationSelectChange()
            if (circleLayer && circleLayer != null && circleLayer != '' && circleLayer != undefined) {
                circleLayer.clear()
                circleLayer.remove()
                circleLayer = null
                circleLayer = new global.DC.PrimitiveLayer('circleLayer')
                global.viewer.addLayer(circleLayer)
            }

            if (this.policeSituationLayerShow == true) {
                this.policeSituationList.forEach((item, index) => {
                    let center = new global.DC.Position(item.lng, item.lat)
@@ -1248,19 +1251,21 @@
        policeSituationSelectChange () {
            let showArr = []

            if (this.policeSituationHistoryType == 0) {
                showArr = this.$refs.bottomContainer.chooseRealData()
            } else {
                showArr = this.$refs.bottomContainer.chooseTimeDate()
            }
            this.$nextTick(() => {
                if (this.policeSituationHistoryType == 0) {
                    showArr = this.$refs.bottomContainer.chooseRealData()
                } else {
                    showArr = this.$refs.bottomContainer.chooseTimeDate()
                }

            showArr.forEach((item, index) => {
                item.lng = Number(item.lng)
                item.lat = Number(item.lat)
                item.url = '/img/icon/jq.png'
                showArr.forEach((item, index) => {
                    item.lng = Number(item.lng)
                    item.lat = Number(item.lat)
                    item.url = '/img/icon/jq.png'
                })

                this.policeSituationList = showArr
            })

            this.policeSituationList = showArr
        },

        siteClick (e) {
@@ -1359,7 +1364,7 @@
                        params: {
                            lng: center[0],
                            lat: center[1],
                            alt: 0,
                            alt: 1,
                            text: item.housingsName
                        },
                        distanceDisplayCondition: { "near": 0, "far": 200000 }
@@ -1939,7 +1944,7 @@
                    data.forEach(e => {
                        e.lng = e.longitude
                        e.lat = e.latitude
                        e.alt = 100
                        e.alt = 1
                        e.url = '/img/icon/map-panorama.png'
                    })
                    this.panoramaList = data

 src/views/house/index.vue

@@ -1076,7 +1076,6 @@
                        this.allHouseFloorList.push(newArr)
                    })
                    this.unitHouseChoosed = this.allHouseFloorList[0]
                    console.log(this.unitHouseChoosed, 2222)
                    if (aoiArr) {
                        this.unitHouseChoosed.forEach((item, index) => {
                            let aoiHeight = aoiArr[1]

 src/views/layout/index.vue

@@ -337,7 +337,6 @@
                    debug: true
                }) || {}
                const date = calcDate(token.datetime, new Date().getTime())
                console.log(6688, date, token)
                if (validatenull(date)) return
                if (date.seconds >= 3000 && !this.refreshLock) {
                    this.refreshLock = true

 src/views/police/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-17 16:59:08
 * @LastEditTime: 2023-02-21 16:54:24
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -420,7 +420,6 @@
        },

        async play (row) {
            console.log(row, 456)
            if (this.flvPlayer != null) {
                this.flvPlayer.pause()
                this.flvPlayer.unload()