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

shuishen

2023-03-21 4c7575f9ab748fbf4b0513d49d53fc89bcb17f16

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

 src/views/activity/index.vue

@@ -1901,13 +1901,13 @@
                    //专网-手台
                    talkBackEquipmentList = res.data.data
                    if(layerName){
                        this.iconImageShowOrHidden('/img/icon/real-recorder.png','/img/icon/real-recorder-ok.png', talkBackEquipmentList, layerName,true) 
                        this.iconImageShowOrHidden('/img/icon/real-phone.png','/img/icon/real-phone-ok.png', talkBackEquipmentList, layerName,true) 
                    }
                } else {
                    //执法记录仪
                    policeCarmeraList = res.data.data
                    if(layerName){
                        this.iconImageShowOrHidden('/img/icon/real-phone.png', '/img/icon/real-phone-ok.png', policeCarmeraList, layerName,true) 
                        this.iconImageShowOrHidden('/img/icon/real-recorder.png', '/img/icon/real-recorder-ok.png', policeCarmeraList, layerName,true) 
                    }
                }
            })

 src/views/home/components/leftContainer.vue

@@ -43,10 +43,10 @@
                <defs>
                    <path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                        d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                    c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                    c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                    c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                    c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                        fill="transparent" />
                    <radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
                        <stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -56,10 +56,10 @@
                        <circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
                            <animateMotion dur="8s"
                                path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                    c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                    c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                    c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                    c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                rotate="auto" repeatCount="indefinite" />
                        </circle>
                    </mask>
@@ -480,21 +480,7 @@
                    xDate.push(item.name)
                    yDate.push(item.num)
                })
                if (this.userInfo.dept_id == '1596020515064381442') {
                    this.keyPlaceNum = 28
                    this.realHouseNum = 205
                    if (isFollow == 2) {
                        xDate = ['学校', '医院', '党政机关', '宾馆酒店', '零售业', '数字经济', '批发业', '装修及建筑业', '租赁业', '房地产业', '商务服务业', '餐饮业']
                        yDate = [36, 1, 3, 34, 16, 25, 30, 33, 2, 7, 6, 2]
                        this.inithouseEcharts(xDate, yDate)
                    } else {
                        xDate = ['反恐重点目标', '危爆品单位']
                        yDate = [14, 14]
                        this.inithouseEcharts(xDate, yDate)
                    }
                } else {
                    this.inithouseEcharts(xDate, yDate)
                }
                this.inithouseEcharts(xDate, yDate)
            })
        },


 src/views/home/index.vue

@@ -644,10 +644,6 @@
        // setTimeout(() => {
        //     this.initGeoJson()
        // }, 3000)




    },

    mounted () {
@@ -676,6 +672,7 @@
                if (type == 1) {

                    this.policeStationOptions = res.data.data
                    console.log('policeStationOptions',this.policeStationOptions );

                    this.policeStationOptions.unshift({
                        name: '全部',
@@ -704,7 +701,7 @@

                } else if (type == 2) {
                    this.areaOptions = res.data.data

                    console.log(type,2222);
                    this.initAreaOptionLayer()

                    this.areaOptions.unshift({
@@ -714,7 +711,7 @@
                } else {
                    this.housingOptions = res.data.data

                    this.housingOptions.forEach(item => {
                    this.housingOptions.lnegth > 0 && this.housingOptions.forEach(item => {
                        const positions = JSON.parse(item.position[0]).coordinates

                        this.$EventBus.$emit('layerPointAdd', {
@@ -1450,9 +1447,10 @@
        initAreaOptionLayer () {
            const that = this
            this.clearPolygonLayer()
            console.log(this.areaOptions,11122)
            this.areaOptions.forEach((item, index) => {

                item.position.forEach(sourceItem => {
                item.position && item.position.forEach(sourceItem => {
                    const Json = { ...JSON.parse(sourceItem) }
                    global.DC.Namespace.Cesium.GeoJsonDataSource.load(Json, {
                        stroke: positionColor[index],
@@ -1868,47 +1866,48 @@
        /**
         * 获取派出所和责任区数据
         */
        getPoliceStationList () {
            getPoliceStationList().then(res => {
                if (res.data.code == 200) {
                    let data = res.data.data
                    data.forEach(policeStation => {
                        //派出所数据匹配
                        policeStation.policeStationName = policeStation.deptName
                        policeStation.policeStationId = policeStation.id
                        policeStation.position = convertStringToList(policeStation.positionString)
                        if (policeStation.children && policeStation.children.length > 0) {
                            //责任区数据匹配
                            policeStation.areaCheckOptions = policeStation.children
                            policeStation.areaCheckOptions.forEach(child => {
                                child.policeStationId = child.parentId
                                child.areaCheckId = child.id
                                child.areaCheckName = child.deptName
                                child.position = convertStringToList(child.positionString)
                                //小区数据匹配
                                if (child.housingArr && child.housingArr.length > 0) {
                                    child.housingArr.forEach(community => {
                                        community.policeStationId = policeStation.id
                                        community.areaCheckId = child.id
                                        community.housingsId = community.id
                                        community.housingsName = community.name
                                        community.position = convertStringToList(community.position)
                                    })
                                    child.housingArr.unshift({ housingsName: '全部' })
                                }
                            })
                            policeStation.areaCheckOptions.unshift({ areaCheckName: '全部' })
                            policeStation.areaOptionArr = policeStation.areaCheckOptions
                        }
                    })
        // getPoliceStationList () {
        //     getPoliceStationList().then(res => {
        //         if (res.data.code == 200) {
        //             let data = res.data.data
        //             console.log(data,111)
        //             data.forEach(policeStation => {
        //                 //派出所数据匹配
        //                 policeStation.policeStationName = policeStation.deptName
        //                 policeStation.policeStationId = policeStation.id
        //                 policeStation.position = convertStringToList(policeStation.positionString)
        //                 if (policeStation.children && policeStation.children.length > 0) {
        //                     //责任区数据匹配
        //                     policeStation.areaCheckOptions = policeStation.children
        //                     policeStation.areaCheckOptions.forEach(child => {
        //                         child.policeStationId = child.parentId
        //                         child.areaCheckId = child.id
        //                         child.areaCheckName = child.deptName
        //                         child.position = convertStringToList(child.positionString)
        //                         //小区数据匹配
        //                         if (child.housingArr && child.housingArr.length > 0) {
        //                             child.housingArr.forEach(community => {
        //                                 community.policeStationId = policeStation.id
        //                                 community.areaCheckId = child.id
        //                                 community.housingsId = community.id
        //                                 community.housingsName = community.name
        //                                 community.position = convertStringToList(community.position)
        //                             })
        //                             child.housingArr.unshift({ housingsName: '全部' })
        //                         }
        //                     })
        //                     policeStation.areaCheckOptions.unshift({ areaCheckName: '全部' })
        //                     policeStation.areaOptionArr = policeStation.areaCheckOptions
        //                 }
        //             })

                    data.unshift({ policeStationName: '全部' })
                    this.policeStationOptions = data
                    this.areaOptionData = data
                    this.housingDate = data
                }
            })
        },
        //             data.unshift({ policeStationName: '全部' })
        //             this.policeStationOptions = data
        //             this.areaOptionData = data
        //             this.housingDate = data
        //         }
        //     })
        // },

        indexMethod (index) {
            return index + 1

 vue.config.js

@@ -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