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

guanqb

2023-03-23 d4479dda8ec5f2bdcca0201f4dfb0d676ef8349c

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: 2023-03-22 16:17:41
 * @LastEditTime: 2023-03-23 11:12:34
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -585,6 +585,7 @@
            })

            // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
            // this.addMxTileset('sdTilesetLayer', `/mx/01/tileset.json`, this.housingIndent)

            if (this.tilesetLayerType == type) {
                this.tilesetLayerType = ''

 src/views/activity/components/drawBtnBox.vue

@@ -176,6 +176,8 @@
            global.viewer.on(global.DC.MouseEventType.CLICK, this.viewerClick)
            global.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, this.viewerLableMove)
            global.viewer.on(global.DC.MouseEventType.LEFT_UP, this.labelUp)

            global.viewer.scene.globe.depthTestAgainstTerrain = true
        })

    },
@@ -273,6 +275,9 @@
                    if (overlay) {
                        addPlotOverlayData = overlay
                        drawArrowLayers.addOverlay(overlay)

                        console.log(overlay, 45555)

                        plot.edit(overlay, (e) => {
                            flag = true
                            let positionStr = ''

 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-24 14:35:04
 * @LastEditTime: 2023-03-22 16:37:04
 * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
 * @Description: 
 * 
@@ -332,7 +332,7 @@
            getAnswerPolices({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
                this.policeSituationRealtimeArr = []

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

 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-03-18 08:59:32
 * @LastEditTime: 2023-03-23 11:11:50
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -777,17 +777,17 @@
                    if (this.cameraList.length > 0) {
                        this.cameraList.forEach(item => {
                            if (item.longitude && item.latitude) {
                                // this.$EventBus.$emit('layerPointAdd', {
                                //     layerName: 'cameraLayers',
                                //     type: 'label',
                                //     params: {
                                //         lng: item.longitude,
                                //         lat: item.latitude,
                                //         alt: 1,
                                //         text: item.name
                                //     },
                                //     distanceDisplayCondition: { "near": 0, "far": 200000 }
                                // })
                                this.$EventBus.$emit('layerPointAdd', {
                                    layerName: 'cameraLayers',
                                    type: 'label',
                                    params: {
                                        lng: item.longitude,
                                        lat: item.latitude,
                                        alt: 1,
                                        text: item.name
                                    },
                                    distanceDisplayCondition: { "near": 0, "far": 200000 }
                                })

                                this.$EventBus.$emit('layerPointAdd', {
                                    layerName: 'cameraLayers',

 src/views/house/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-03-21 13:47:04
 * @LastEditTime: 2023-03-22 16:36:28
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -775,6 +775,7 @@
                    this.villageInfo.pic_url_list.push(pic_url_item)
                })
                // 停车场出入口商场
                if (res.data.result[0].deep_infos && res.data.result[0].deep_infos.length) {
                let deepData = res.data.result[0].deep_infos.deep_info
                this.parkingLotData = []
                this.comeOutData = []
@@ -788,13 +789,18 @@
                        this.businessData.push(item)
                    }
                })
                }

                // 小区楼栋数据
                if (res.data.result[0].children_infos && res.data.result[0].children_infos.length) {
                let buildData = res.data.result[0].children_infos
                this.buildingList = []
                buildData.forEach(item => {
                    this.buildingList.push({ name: `${item.sname}`, siteJd: `${item.x}`, siteWd: `${item.y}`, siteGd: 360, build_id: `${item.std_addr_id.split('|')[1]}`, floor_num: `${item.floor_num}`, elev: `${item.elev}` })
                })
                this.buildingClick(this.buildingList[0])
                }

                this.callPolicePage.currentPage = 1
                this.getAlarmList()
            })
@@ -1369,9 +1375,11 @@
        this.$EventBus.$emit('clearHouse3D')
        wallLayer.clear()

        if (circleLayer && circleLayer != null) {
        circleLayer.clear()
        circleLayer.remove()
        circleLayer = null
        }

        for (let i = 0; i < timer.length; i++) {
            clearInterval(timer[i])

 src/views/policeInfor/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-03-07 14:39:45
 * @LastEditTime: 2023-03-22 16:37:26
 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
 * @Description: 辖区管理
 * 
@@ -309,7 +309,7 @@
            getAnswerPolices({ deptId: this.userInfo.dept_id }).then(res => {
                this.realPoliceInforData = []

                if (res.data.result.length > 0) {
                if (res.data.result && res.data.result.length) {
                    this.realPoliceInforData = res.data.result.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                    })

 vue.config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-22 09:51:32
 * @LastEditTime: 2023-03-22 17:22:24
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -157,8 +157,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                // target: "http://localhost:82",
                target: "http://192.168.0.126:82",
                target: "http://localhost:82",
                // target: "http://192.168.0.126:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566