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

guanqb

2023-04-05 87370ec0ca59a817a11428e5d3f10e0238e56138

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

 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

@@ -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>
@@ -336,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 () {
@@ -1073,7 +1076,7 @@
                width: 100%;
                display: flex;
                justify-content: space-evenly;
                margin-top: 15px;
                margin-top: -10px;

                .point {
                    width: 12px;