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

guanqb

2023-02-01 f05a2b1b02fe6ff224e85b46287f481d8b21f46a

 src/components/map/components/mapPopup.vue

@@ -125,6 +125,9 @@

export default {
    name: 'mapPopup',

    inject: ["getWidth", 'userInfo'],

    data () {
        return {
            currentBtn: '接警信息',
@@ -132,8 +135,6 @@
            scaleDomFlag: false
        }
    },

    inject: ["getWidth"],

    computed: {
        ...mapGetters([
@@ -163,7 +164,7 @@

            this.CJdata = {}

            getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
            getActAsPoliceList(this.dataPopup.JJDBH, this.userInfo.dept_id).then(res => {
                if (res.data.data.records.length > 0) {
                    this.CJdata = res.data.data.records[0]
                }