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

shuishen

2023-04-06 3fdf6ac09566a436995d3aef6def5a1139c9ffe2

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

 src/styles/media/index.scss

@@ -6,6 +6,8 @@

        #app {



            .wrapper {
                width: 100vw;
                height: 100%;
@@ -1554,15 +1556,11 @@
                                            padding-right: countSizeVw(20, 1920);
                                        }



                                        .el-select .el-input .el-select__caret {
                                            font-size: countSizeVh(14);
                                            line-height: countSizeVh(32);
                                        }
                                    }


                                }
                            }

@@ -2050,23 +2048,7 @@
                        }
                    }

                    .equiment-details-box-two {
                        .el-dialog {
                            height: countSizeVh(1000);
                        }

                        .all-pagination-sty {
                            margin-top: countSizeVh(10);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(50)) !important;
                        }

                        .el-dialog .el-dialog__body .el-table {
                            height: calc(100% - countSizeVh(40)) !important;
                        }
                    }

                    .keyPerson-details-box-two {
                        .el-dialog {
@@ -2614,9 +2596,6 @@
                            }
                        }
                    }



                }

                .flexible-btn {
@@ -2788,6 +2767,24 @@
                .popup-dom .content .data-box .line {
                    font-size: countSizeVw(14, 1920);
                }

                .equiment-details-box-two {
                    .el-dialog {
                        height: countSizeVh(930);
                    }

                    .all-pagination-sty {
                        margin-top: countSizeVh(10);
                    }

                    .el-main {
                        height: calc(100% - countSizeVh(50)) !important;
                    }

                    .el-dialog .el-dialog__body .el-table {
                        height: calc(100% - countSizeVh(60)) !important;
                    }
                }
            }

            .auth-page {

 src/views/home/components/rightContainer.vue

@@ -439,7 +439,8 @@
            const optionsData = await this.getCaseAll(date[0], date[1])


            eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
            // eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
            eventchangemychart.setOption(this.initEventChangeOption(['盗窃', '诈骗', '纠纷', '其他'], [12, 34, 25, 8]))

            setTimeout(() => {
                this.eventChangeEchartsLoading = false

 src/views/house/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-04-06 10:06:43
 * @LastEditTime: 2023-04-06 17:55:01
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -189,7 +189,7 @@
                                                :class="{ on: floorChoosed == value.properties.fojcu }">
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                     <div class="warning"></div>-->
                                                    <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -264,7 +264,6 @@
                                @current-change="handleCurrentChange"></el-pagination>
                        </div>
                    </el-main>

                </div>
            </div>
        </div>
@@ -620,6 +619,19 @@
    updated () { },

    methods: {
        // 获取半年前时间
        getHalfYearTime () {
            const cc = new Date().getTime()
            let halfYear = 365 / 2 * 24 * 3600 * 1000
            let pastResult = cc - halfYear
            let pastDate = new Date(pastResult),
                pastYear = pastDate.getFullYear(),
                pastMonth = pastDate.getMonth() + 1,
                pastDay = pastDate.getDate()
            let halfYearTime = pastYear + '-' + pastMonth + '-' + pastDay
            return halfYearTime
        },

        showHouseingTileset (params) {
            if (params.curType == params.type) {
                this.$EventBus.$emit('unbindMxClick', this.getAoiByPtStd)
@@ -1291,17 +1303,20 @@
            circleLayer = new global.DC.PrimitiveLayer("circleLayer")
            global.viewer.addLayer(circleLayer)

            // 获取半年内数据
            getAlarmList({
                current: this.callPolicePage.currentPage,
                size: this.callPolicePage.pagesize,
                sfdz: this.villageInfo.name,
                jjdwbh: this.userInfo.dept_id,
                time: this.getHalfYearTime()
            }).then((res) => {
                this.callPolicePage.count = res.data.data.pages

                if (res.data.data.records.length > 0) {

                    this.callPoliceData = res.data.data.records.map((item, index) => {
                        const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
                        const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0] ? BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE : ''

                        return {
                            ...item,

 src/views/policeInfor/index.vue

@@ -382,6 +382,11 @@
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            }).catch(res => {
                this.realEmptyText = "实时警情请求失败"
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })

            // this.realPoliceInforData = [{