Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-03-22 72ecf078f6c2e37e8c7bc3b2ac48ab0609c5f754

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 src/styles/base/index.scss

@@ -926,6 +926,7 @@
                height: 32px;
                line-height: 32px;
                width: 120px;
                text-align: left;
            }

            .edit-line-btn-box {

 src/views/activity/components/drawBtnBox.vue

@@ -461,7 +461,6 @@
                position = new global.DC.Position(Number(position[0]), Number(position[1]))
                let label = new global.DC.Label(position, item.name)
                label.attrParams = { 'id': item.id, item }
                console.log(item, `${item.width}px`, 123)
                label.setStyle({
                    'fillColor': color,
                    "font": `${item.width}px sans-serif`,
@@ -683,7 +682,9 @@
            }

            if ('width' in params) {
                if (overlay.attrParams && overlay.attrParams.data && overlay.attrParams.data.type && overlay.attrParams.data.type == 3) return
                if (overlay.attrParams && overlay.attrParams.data && overlay.attrParams.data.type && overlay.attrParams.data.type == 3) {
                    overlay.attrParams.data.width = params.width
                } else {
                let linePosition = ''
                if ('position' in params) {
                    linePosition = params.position.replace(/,/g, ";").replace(/ /g, ",")
@@ -718,6 +719,7 @@
                overlay.attrParams.linePositionStr = linePosition
                overlay.attrParams.polygonPositionStr = positionStr
                overlay.attrParams.color = params.color
                    overlay.attrParams.width = params.width

                let areaPolygon = new global.DC.Polygon(positionStr)
                drawLayers.addOverlay(areaPolygon)
@@ -729,6 +731,7 @@
                areaPolygon.on(global.DC.MouseEventType.CLICK, this.$parent.lineOverlayTypeClick)
                overlay.remove()
            }
            }
        },

        // 修改警车

 src/views/activity/components/videoControlBox.vue

@@ -317,7 +317,6 @@
         * @return {*}
         */
        getRegionList (positionNewStr) {
            console.log(positionNewStr)
            getRegionList({ page: 1, count: 15, range: positionNewStr }).then(res => {
                let monitorData = res.data.data.list
                this.initMonitoringIcon(monitorData)

 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-03-22 15:15:18
 * @LastEditTime: 2023-03-22 15:18:32
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 电子沙盘
 *
@@ -1412,6 +1412,7 @@
        // 定时查找实时警力资源
        searchRealResources (layerName) {
            console.log(`定时器realPoliceTimer[${layerName}]开启了`)
            console.log(`定时器[${layerName}]开启了`)
            let type = ''
            if (layerName == 'activityCarLayers') {
                type = 0

 src/views/house/index.vue

@@ -728,7 +728,7 @@
                circleLayer = null
            }

            // this.getResidentialQuartersInfo(current.id, '361102')
            this.getResidentialQuartersInfo(current.id, '361102')
            this.getSearchExtensivelyBgAoiDeepdata('ebf48ecaa1fd436fa3d40c4600aa051f', '361100', current.id, '1|3')
            this.getVillageInfo(current.id)

@@ -750,7 +750,6 @@
                circleLayer = null
            }
        },


        // 大搜之搜索面详细数据（停车场出入口商场、 小区名称类型地址、楼栋数据）
        getSearchExtensivelyBgAoiDeepdata (ak, region, ids, infos) {
@@ -1184,7 +1183,7 @@
        // 获取责任民警、所属辖区
        getVillageInfo (aoiId) {
            getVillageInfo(aoiId).then(res => {
                // this.getResidentialQuartersInfo(res.data.data.md5Id, '361102')
                this.getResidentialQuartersInfo(res.data.data.md5Id, '361102')
                this.villageInfo.policeName = res.data.data.policeName
                this.villageInfo.policeStationName = res.data.data.policeStationName
            })
@@ -1229,10 +1228,14 @@
        getResidentialQuartersInfo (area_id, adcode) {
            // '6E513C5E5D1611EAB6183C15FB00027B', '361102'
            getResidentialQuartersInfo(area_id, adcode).then(res => {
                let positionStr = ''
                res.data.data.geometry.coordinates[0].forEach(item => {
                    positionStr += item[0] + ',' + item[1] + ',' + '10;'
                })

                if (wallLayer != null) {
                    wallLayer.clear()
                }
                let positionStr = res.data.data.wkt.slice(12, res.data.data.wkt.length - 2).replace(/,/g, ';').replace(/ /g, ',').replace(/,0/g, ',10')
                let wall = new global.DC.Wall(positionStr)

                wall.setStyle({

 src/views/police/index.vue

@@ -356,7 +356,7 @@

                return
            }
            console.log(row)
            console.log('点击了表格', row)
            this.$EventBus.$emit('toPosition', {
                layerName: 'carLayers',
                siteJd: row.lng,

 src/views/video/list.vue

@@ -376,7 +376,6 @@
                data._positions.forEach(item => {
                    positionStr = positionStr + item._lng + ',' + item._lat + ';'
                })
                console.log('positionStr', positionStr)
                let coords = global.DC.GeoTools.polylineBuffer(positionStr, 100)
                let polygon = new global.DC.Polygon(coords)
                let position = ''
@@ -511,7 +510,6 @@
        getSearchExtensively (ak, region, query) {
            getSearchExtensively(ak, region, query).then(res => {
                this.searchExtensivelyArray = res.data.result
                console.log('res.data.result', res.data.result[0].name)
            })
        },


 src/views/video/region - 副本.vue

 vue.config.js

@@ -157,8 +157,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://192.168.0.200:82",
                // target: "http://localhost:82",
                target: "http://192.168.0.200:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566