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

shuishen

2023-04-05 7057f9386403d9aa6baf4f024373e18a585b1c48

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

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

@@ -149,6 +149,25 @@

                return
            }
            console.log(row, 'row111111111')
            this.$store.commit('SET_MAPSEARCHPOPUP', true)

            this.$store.commit('SET_MAPSEARCHPOPUPDATA', {
                name: row.realName
            })

            var popup = new global.DC.DivForms(global.viewer, {
                domId: 'mapSearchPopup',
                position: [
                    global.DC.Transform.transformWGS84ToCartesian(
                        new global.DC.Position(
                            Number(row.X),
                            Number(row.Y),
                            0
                        )
                    )
                ]
            })

            this.$EventBus.$emit('toPosition', {
                layerName: 'carLayers',

 src/views/home/components/leftContainer.vue

@@ -901,7 +901,7 @@
            let personInfo = await this.getPersonInfo()
            keyPeopleDataLength = personInfo.length
            if (this.userInfo.dept_id == '1596020515064381442') {
                personInfo = [{ count: 8, name: '征地拆迁群体', value: 8 }, { count: 4, name: '非涉法涉诉重点个访人员', value: 4 }, { count: 4, name: '涉法涉诉重点个访人员', value: 4 }, { count: 1, name: '楼盘业主维权群体', value: 1 }]
                personInfo = [{ count: 11, name: '征地拆迁群体', value: 11 }, { count: 3, name: '非涉法涉诉重点个访人员', value: 3 }, { count: 4, name: '涉法涉诉重点个访人员', value: 4 }, { count: 1, name: '楼盘业主维权群体', value: 1 },{ count: 1, name: '欠薪讨债群体', value: 1 }]
            }

            keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))
@@ -989,7 +989,7 @@
                        top: 'middle',
                        left: '45%',
                        y: '1%',
                        itemGap: 20,
                        itemGap: 15,
                        textStyle: {
                            color: '#fff'
                        },
@@ -1002,7 +1002,7 @@
                                }
                            }
                            let v = tarValue
                            return `${name}     ${v} 人    `
                            return `${name}  ${v} 人    `
                        },
                    },
                    series: [

 src/views/home/components/rightContainer.vue

@@ -7,7 +7,7 @@
                </div>

                <div class="table-box" v-show="!showMJL">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%;"
                        :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        empty-text="暂无值班信息" v-loading="schedulingLoading" element-loading-text="拼命加载中"
@@ -16,8 +16,8 @@
                        <el-table-column prop="person" label="姓名"></el-table-column>
                        <el-table-column prop="contact" label="联系方式"></el-table-column>
                    </el-table>
                    <div class="pointList">
                        <el-tooltip class="item" effect="dark" :content="item.dept" placement="top"
                    <div class="pointList" v-if="schedulingList==[]">
                        <el-tooltip class="item" effect="dark" :content="item.dept" placement="top" 
                            v-for="(item, index) in schedulingDeptList" :key="index">
                            <div class="point" @click="getSchedlingList(item)"></div>
                        </el-tooltip>
@@ -25,7 +25,7 @@
                </div>

                <div class="table-box" v-show="showMJL">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%" empty-text=" "
                        :show-header="false" :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        v-loading="schedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
@@ -235,7 +235,7 @@
                this.$refs.caseBox.offsetHeight -
                this.$refs.crowdBox.offsetHeight -
                this.$refs.alertBoxTitle.offsetHeight -
                86
                55
        })
    },

@@ -287,12 +287,12 @@
                const data = [
                    {
                        person:
                            "徐星逸、任圣日、娄永攀、蔡善龙、陈小强、梅祥、吕镇、刘开勇、付建冬",
                            "徐星逸，任圣日，娄永攀，蔡善龙，陈小强，刘开勇，梅祥，吕镇，付建冬",
                        patrol: "章正椿，夏文翔，叶江明，黄俊龙，苏茯林，王顺祥",
                    },
                    {
                        person:
                            "矢裕忠、戴饶平、余传公、杨敏、苏浩男、周安云、蒋丁岩、陈圣俊、雷智荐",
                            "矢裕忠，戴饶平，余传公，杨敏，苏浩男，周安云，蒋丁岩，陈圣俊，雷智荐",
                        patrol: "潘林彬，刘志祥，李志强，杨俊浩，黄天行，叶子淳",
                    },
                    {
@@ -309,13 +309,15 @@
                    }
                    return arr
                })

                this.schedulingList = matrixData[0].map((col, i) => {
                setTimeout(() => {
                    this.schedulingList = matrixData[0].map((col, i) => {
                    return [this.originTitle[i], ...matrixData.map((row) => {
                        return row[i]
                    })]
                })

                    this.schedulingLoading = false
                }, 1000)
                
                this.$nextTick(() => {
                    this.tableHeight =
                        this.$refs.Container.offsetHeight -
@@ -334,10 +336,13 @@
                getSchedulingList(1, 100, params).then((res) => {
                    this.schedulingList = res.data.data.records
                })


                setTimeout(() => {
                    this.schedulingLoading = false
                }, 500)
            }
            setTimeout(() => {
                this.schedulingLoading = false
            }, 1000)

        },

        echartsResize () {
@@ -1071,7 +1076,7 @@
                width: 100%;
                display: flex;
                justify-content: space-evenly;
                margin-top: 15px;
                margin-top: -10px;

                .point {
                    width: 12px;
@@ -1083,7 +1088,14 @@
            }

            :deep(.el-table .cell) {
                white-space: pre-line;
                // white-space: pre-line;
                white-space: pre-wrap;
                height: 100% !important;
                line-height:3.4vh !important;
            }

            :deep(.el-table .el-table__body-wrapper) {
                height: 100% !important;
            }
        }


 src/views/home/index.vue

@@ -1,8 +1,8 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-04 17:02:25
 * @LastEditors: song
 * @LastEditTime: 2023-04-05 01:34:19
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -993,7 +993,22 @@
            })

            if (e == true) {
                initMapPosition()
                if (this.userInfo.dept_id == '1123598813738675201') {
                    //分局定位
                    initMapPosition()
                }
                else {
                    //其他派出所定位
                    const center = this.getAllRegionCenter(this.areaOptions)

                    this.$EventBus.$emit('toPosition', {
                        siteJd: center[0] + 0.0046,
                        siteWd: center[1] - 0.04,
                        siteGd: 4000,
                        siteHeading: -3,
                        sitePitch: -45
                    })
                }

                this.getEquipmentAll({ type: 0, deptId: this.policeStaionID == '' ? this.userInfo.dept_id : this.policeStaionID })
            }
@@ -1006,7 +1021,24 @@
            })

            if (e == true) {
                initMapPosition()

                if (this.userInfo.dept_id == '1123598813738675201') {
                    //分局定位
                    initMapPosition()
                }
                else {
                    //其他派出所定位
                    const center = this.getAllRegionCenter(this.areaOptions)

                    this.$EventBus.$emit('toPosition', {
                        siteJd: center[0] + 0.0046,
                        siteWd: center[1] - 0.04,
                        siteGd: 4000,
                        siteHeading: -3,
                        sitePitch: -45
                    })
                }


                this.getEquipmentAll({ type: 1, deptId: this.policeStaionID == '' ? this.userInfo.dept_id : this.policeStaionID })
            }
@@ -1914,6 +1946,16 @@
            type: 'ClusterLayer'
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'keypeopleslayer',
            type: 'ClusterLayer'
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'schoolJSONlayer',
            type: 'ClusterLayer'
        })

        if (cylinderLayer != null) {
            cylinderLayer.remove()
            cylinderLayer = null