Merge remote-tracking branch 'origin/master'

linwe

2024-12-17 89426e484f5540d3bf108a3b9267519a154ba7cd

Merge remote-tracking branch 'origin/master'

 src/views/home/index.vue

@@ -1069,7 +1069,7 @@
        })

        if (this.userInfo.dept_id != '1123598813738675201') {
            this.policeStationCheckValue = this.userInfo.user_name
            // this.policeStationCheckValue = this.userInfo.user_name
            this.selectAllClass = true
            this.policeStaionID = this.userInfo.dept_id
        }
@@ -1497,6 +1497,7 @@

        // 加载首页下拉列表数据
        getPoliceStationTree (type, id = '') {
            var that = this;
            getPoliceStationTree(type, id).then(res => {
                if (type == 1) {

@@ -1509,10 +1510,15 @@

                    if (this.userInfo.dept_id != '1123598813738675201') {

                        

                        let currentItem

                        res.data.data.some(item => {
                            if (item.id == this.userInfo.dept_id) currentItem = item
                            if (item.id == that.userInfo.dept_id){
                                currentItem = item
                                that.policeStationCheckValue = item.name
                            }
                        })

                        this.getPoliceStationTree(2, this.userInfo.dept_id)