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

guanqb

2023-02-06 39b3b8b07ff94f800ba55f8f459a1379f40fc5e5

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

 src/views/home/components/bottomContainer.vue

@@ -283,7 +283,6 @@

        // 时间改变事件
        datePickerChange (e) {
            console.log(this.dateFormat(e))
            // this.timetype
            if (this.timetype == 0) {


 src/views/home/components/leftContainer.vue

@@ -133,9 +133,9 @@
import { getVillagePersonStatisticInfo, getVillagePersonStatisticInfoByPoliceStationId, getPersonInfo, getPersonInfoPage, getHouseStatisticInfo } from "@/api/dept"

let homePersonmyChart = null
let keyPersonmyChart = null
let houseMyChart
let landMyChart
let keyPersonmyChart

let myColor = ['#00e9db', '#00c0e9', '#0096f3', '#33CCFF', '#33FFCC', '#eb2100', '#eb3600', '#d0570e', '#d0a00e', '#34da62']

@@ -312,9 +312,14 @@
            this.tabType = type
            this.dataDeep = 1

            if (homePersonmyChart != null) {
            if (homePersonmyChart != null && homePersonmyChart != '' && homePersonmyChart != undefined) {
                homePersonmyChart.dispose()
                homePersonmyChart.off('click')
            }

            if (keyPersonmyChart != null && keyPersonmyChart != '' && keyPersonmyChart != undefined) {
                keyPersonmyChart.dispose()
                keyPersonmyChart.off('click')
            }

            if (type == 0) {
@@ -985,7 +990,6 @@
            landMyChart.off('click')

            landMyChart.on('click', params => {
                console.log(params, 95959999)
                if (this.tabTypeThree == 0) {
                    this.$emit('showlanddetail', params.name, 2, params.data.id)
                } else {

 src/views/home/components/rightContainer.vue

@@ -103,8 +103,8 @@
const oneColor = ['#4caf50', '#2979ff', '#ffd600', '#0d47a1', '#b71c1c']
const twoColor = ['#5470FE', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']

let equipmentmyChart
let eventchangemychart
let equipmentmyChart = null
let eventchangemychart = null
let timer
let equimentDataLength = 0

@@ -267,6 +267,9 @@
        // 初始化案件统计
        async initEventChangeEcharts () {
            var chartDom = document.getElementById('EventChangeEcharts')

            if (eventchangemychart != null && eventchangemychart != '' && eventchangemychart != undefined) eventchangemychart.dispose()

            eventchangemychart = this.$echarts.init(chartDom)

            const date = this.eventTime.map(item => {
@@ -457,6 +460,8 @@
        // 现有设备饼图初始化
        async initEquipmentEcharts () {
            var chartDom = document.getElementById('EquipmentEcharts')
            if (equipmentmyChart != null && equipmentmyChart != '' && equipmentmyChart != undefined) equipmentmyChart.dispose()

            equipmentmyChart = this.$echarts.init(chartDom)

            const data = await this.getEquipment()

 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-02-04 16:15:02
 * @LastEditTime: 2023-02-06 10:35:26
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -800,7 +800,6 @@
            // this.$refs.rightContainer.selectPoliceChangeEventData(item.policeStationName)
            // this.$refs.bottomContainer.selectPoliceSituatiionArr(item.policeStationName)
            // this.policeSituationChange()

        },

        areaSelect (item) {
@@ -1308,8 +1307,6 @@
                siteHeading: -3,
                sitePitch: -45
            })

            console.log(center, 89888888)

            // this.houseChange(true)
        },