冲突合并

shuishen

2023-06-25 52c3fa2def011f13c8b363811a54deb1d972f00e

冲突合并

 public/data/汪家园林家小区2号id详情搜.json

New file
@@ -0,0 +1,49 @@
{
    "status": 0,
    "message": "ok",
    "src": "gis-service-all-us",
    "total": 1,
    "result": [{
        "uid": "a76a8801eab4727c9049b70d77860db5",
        "name": "汪家园林家小区2号",
        "address": "江西省上饶市信州区茅家岭街道汪家园林家小区2号",
        "extinfo": "POLYGON((117.9497976851966 28.437034791644866,117.94979567990713 28.437140767274737,117.94990744889367 28.437145515903506,117.94991643974849 28.437039524626968,117.9497976851966 28.437034791644866))",
        "location": {
            "lng": 117.949854,
            "lat": 28.43709
        },
        "telephone": "",
        "type_name": "商务住宅|住宅区|住宅区",
        "type": 120300,
        "parent_id": "8ae938874cab332d0bb4258c5fe6599f",
        "adcode": "361102",
        "alias": "汪家园林家小区汪家园林家小区2号",
        "navi_location": [],
        "exttype": "BUILDING",
        "score": "",
        "std_addr_id": "21499F52BD7411EDA0956C92BFF57E65|35E21232BD7411ED8A973B09AF574C47|",
        "std_addr_address": "江西省上饶市信州区茅家岭街道汪家园林家小区|江西省上饶市信州区茅家岭街道汪家园林家小区2号|",
        "cid": "35E21232BD7411ED8A973B09AF574C47",
        "std_address": "江西省上饶市信州区茅家岭街道汪家园林家小区2号",
        "province": "江西省",
        "city": "上饶市",
        "district": "信州区",
        "cityadcode": "361100",
        "town": "茅家岭街道",
        "detail_infos": {
            "extinfo": "POLYGON((117.9497976851966 28.437034791644866,117.94979567990713 28.437140767274737,117.94990744889367 28.437145515903506,117.94991643974849 28.437039524626968,117.9497976851966 28.437034791644866))",
            "elev_num": 0,
            "elev": 0,
            "floor": 5,
            "pic_url": "361100/2UED8Q3DYS_1665969683532.jpg",
            "floor_room": ""
        },
        "business_id": "35E21232BD7411ED8A973B09AF574C47",
        "citycode": 793,
        "datasource": "mapcf",
        "pc_type": 1,
        "keylevel": "汪家园林家小区^13|2号^14",
        "pic_url": "361100/2UED8Q3DYS_1665969683532.jpg",
        "bg_id": "a76a8801eab4727c9049b70d77860db5"
    }]
}

 public/data/汪家园林家小区id详情搜.json

New file
Diff too large

 src/views/home/components/dialog/areaDetailsBox.vue

@@ -147,7 +147,8 @@

            getPersonInfoPage({
                status,
                deptId: this.userInfo.dept_id,
                // deptId: this.userInfo.dept_id,
                deptId: this.peopleSearchQuery.dept_id,
                areaId: this.peopleSearchQuery.id,
                realName: this.peoplePoliceName,
                phone: this.peopleCallPhone,
@@ -176,18 +177,23 @@
            })
        },

        showpeopledetail (id, name, isIncludeKeypeople) {
        showpeopledetail (id, name, isIncludeKeypeople, deptId) {
            this.peopleTitle = name
            this.peopleSearchQuery.id = id
            if (deptId) {
                this.peopleSearchQuery.dept_id = deptId
            } else {
                this.peopleSearchQuery.dept_id = this.userInfo.dept_id
            }
            this.peopleVisible = true
            this.peopleInfoList = []
            console.log('id, name, isIncludeKeypeople', id, name, isIncludeKeypeople)
            console.log('id, name, isIncludeKeypeople,deptId', id, name, isIncludeKeypeople, deptId)
            if (isIncludeKeypeople == 'includeKeypeople') {
                this.getPersonInfoPage()
            } else if (isIncludeKeypeople == 'onlyKeypeople') {
                this.getPersonInfoPage(2)
            } else {
                this.getPersonInfoPage(1)
                this.getPersonInfoPage()
            }
        }
    },

 src/views/home/components/leftContainer.vue

@@ -215,6 +215,7 @@
            gzcsPerson: '',
            gzcsPhone: '',
            isFirstMounted: true,
            clickPoliceStationId: '',
        }
    },

@@ -317,7 +318,7 @@
         */
        getHomeAllData (id = '') {
            this.policeStaionID = id

            this.isFirstMounted = true
            if (id != '') {
                this.showBack = false
                this.isAllPoliceStation = false
@@ -327,7 +328,7 @@
                this.showBack = true
                this.isAllPoliceStation = true
            }

            this.tabType = 0//解决下拉选择派出所重点人员显示bug
            this.personTabClick(this.tabType)

            this.houseTabClick(this.tabTypeTwo)
@@ -354,8 +355,8 @@
        personTabClick (type) {
            if (type == 0) {
                if (this.tabType == 0 && !this.isFirstMounted) {
                    console.log('再次点击人口总数')
                    this.$emit('showpeopledetail', '', '总人口列表', 'includeKeypeople')
                    console.log('再次点击人口总数', this.isFirstMounted)
                    this.$emit('showpeopledetail', '', '总人口列表', 'includeKeypeople', this.clickPoliceStationId)
                    return
                }
                this.isFirstMounted = false
@@ -372,9 +373,9 @@
                }

            } else if (type == 1) {
                if (this.tabType == 1) {
                if (this.tabType == 1 && !this.isFirstMounted) {
                    console.log('再次点击重点人口')
                    this.$emit('showpeopledetail', '', '重点人员列表', 'onlyKeypeople')
                    this.$emit('showpeopledetail', this.clickPoliceStationId, '重点人员列表', 'onlyKeypeople')
                    return
                }
                this.dataDeep = 1
@@ -425,11 +426,11 @@
                    var chartDom = document.getElementById('PersonEcharts')
                    homePersonmyChart = this.$echarts.init(chartDom)
                    this.personAll = res.data.data
                    console.log('this.personAll', this.personAll)

                    if (this.userInfo.dept_id == '1596020515064381442') {
                        this.personAll.emphasisNum = 23
                    }


                    this.villagePersonStatisticInfoList = res.data.data
                    var xDate = [], yDate1 = [], yDate2 = []
@@ -449,7 +450,6 @@
                            })
                        })
                    }

                    homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate1, yDate2, peopleColor1, peopleColor2), true)
                    this.clickPeopleChart()

@@ -1081,6 +1081,7 @@
                    })
                    this.personEchartsLoading = true
                    this.getVillagePersonStatisticInfoByPoliceStationId(params.data.id)
                    this.clickPoliceStationId = params.data.id
                } else {
                    this.$emit('showpeopledetail', params.data.id, params.data.name)
                }
@@ -1209,7 +1210,7 @@
            this.disposeEchart()

            let personInfo = await this.getPersonInfo()

            console.log('personInfo', personInfo)
            keyPeopleDataLength = personInfo.length
            if (this.userInfo.dept_id == '1596020515064381442') {
                personInfo = [
@@ -1256,6 +1257,8 @@
         */
        getPersonInfo () {
            const data = getPersonInfo({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
                console.log('getPersonInfo', { deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id })

                res.data = res.data.map(item => {
                    item = {
                        ...item,

 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-06-20 15:17:51
 * @LastEditTime: 2023-06-25 14:25:12
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -2380,8 +2380,8 @@
         * @param {*} name
         * @return {*}
         */
        showpeopledetail (id, name, isIncludeKeypeople) {
            this.$refs.areaDetailsBox.showpeopledetail(id, name, isIncludeKeypeople)
        showpeopledetail (id, name, isIncludeKeypeople, deptId) {
            this.$refs.areaDetailsBox.showpeopledetail(id, name, isIncludeKeypeople, deptId)
        },

        /**

 vue.config.js

@@ -167,6 +167,7 @@
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://106.225.193.35:82",
                // target: "http://192.168.1.170:82",
                // target: "http://192.168.0.100:82",
                // target: "http://172.16.13.150:82",
                // target: "http://10.141.11.11:8081/api",