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

shuishen

2023-03-31 03ab12b4ff251e4f7facd0e441fd56b04bab8862

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

 src/styles/media/index.scss

@@ -2066,6 +2066,14 @@
                            font-size: countSizeVh(18);
                            right: countSizeVw(10, 1920);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(40));
                        }

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

                    .keyPerson-details-box {
@@ -2747,6 +2755,14 @@
                        background-color: #4ccc7d;
                    }

                    .el-main {
                        height: calc(100% - countSizeVh(40));
                    }

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

                }

                .popup-dom .content .data-box .line {

 src/views/activity/index.vue

@@ -537,7 +537,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.7)'
                background: 'rgba(0, 0, 0, 0.2)'
            })
        },


 src/views/home/components/leftContainer.vue

@@ -131,7 +131,8 @@
        </div>

        <el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-close="landBeforeClose"
            :close-on-click-modal="true" class="land-details-box">
            :close-on-click-modal="true" class="land-details-box" v-loading="landLoading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
            <el-table :data="xxArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
@@ -175,6 +176,7 @@
    data () {
        return {
            tabType: 0,
            landLoading: false,
            peopletype: 0,
            tabTypeTwo: 0,
            tabTypeThree: 0,
@@ -234,6 +236,7 @@
            }
        })
    },

    methods: {
        rowClick (row) {
            if (row.x == '' || row.y == '') {
@@ -376,7 +379,7 @@
                        text: '拼命加载中',
                        color: '#c23531',
                        textColor: '#FFF',
                        maskColor: 'rgba(17, 38, 163, 0.6)',
                        maskColor: 'rgba(0, 0, 0, 0.2)',
                        zlevel: 0,
                    })
                    setTimeout(() => {
@@ -418,7 +421,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 1)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -547,6 +550,7 @@
        backBegin () {
            this.dataDeep = 1
            this.initPersonEcharts()
            this.$parent.getAllPoliceStationCenter()
        },

        /**
@@ -596,7 +600,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -661,8 +665,10 @@
                    {
                        data: y1Date,
                        type: 'bar',
                        barWidth: '24%',
                        // barWidth: '10%',
                        barCategoryGap: '80%',
                        zlevel: 2,
                        // cursor: 'default',
                        itemStyle: {
                            normal: {
                                // barBorderRadius: [0, 30, 30, 0],
@@ -704,6 +710,37 @@
                    bottom: '2%',
                    containLabel: true
                },
                // dataZoom: [
                //     {
                //         type: "inside",
                //         startValue: 0,
                //         endValue: 8,
                //         minValueSpan: 2,
                //         maxValueSpan: 2,
                //         yAxisIndex: [0],
                //         zoomOnMouseWheel: false,  // 关闭滚轮缩放
                //         moveOnMouseWheel: true, // 开启滚轮平移
                //         moveOnMouseMove: true  // 鼠标移动能触发数据窗口平移 
                //     },
                //     {
                //         type: 'slider',
                //         realtime: true,
                //         startValue: 0,
                //         endValue: 8,
                //         width: '3.5',
                //         height: '80%',
                //         yAxisIndex: [0], // 控制y轴滚动
                //         fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
                //         borderColor: "rgba(17, 100, 210, 0.12)",
                //         backgroundColor: '#cfcfcf',//两边未选中的滑动条区域的颜色
                //         handleSize: 0, // 两边手柄尺寸
                //         showDataShadow: false,//是否显示数据阴影 默认auto
                //         showDetail: false, // 拖拽时是否展示滚动条两侧的文字
                //         top: '1%',
                //         right: '5',
                //     }

                // ]
            }
        },

@@ -829,7 +866,11 @@
                console.log('clickHouseChart', params)
                if (params.name == '学校') {
                    this.xxPopupShow = true
                    this.landLoading = true
                    setTimeout(() => {
                        this.landLoading = false
                    this.xxArr = schoolJSON
                    }, 1000)
                }
            })
        },
@@ -855,7 +896,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -1050,16 +1091,16 @@
         * @return {*}
         */
        initLandEcharts (landData) {
            this.disposeLandEchart()
            var chartDom = document.getElementById('landEcharts')

            landMyChart = this.$echarts.init(chartDom)


            landMyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -1132,7 +1173,9 @@
                landMyChart.dispose()
                landMyChart.off('click')
            }
        }
        },


    },

    destroyed () {

 src/views/home/components/rightContainer.vue

@@ -344,7 +344,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -421,7 +421,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
@@ -645,7 +645,7 @@
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {

 src/views/home/components/schedulingList.vue

@@ -14,11 +14,10 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearSearchScheduling">清空</el-button>
            </div>
            <el-main v-loading="chedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <el-table :data="schedulingTableData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

                    <el-table-column label="序号" type="index" align="center">
                        <template slot-scope="scope">
                            <span>{{ (page.currentPage - 1) * page.pageSize + scope.$index + 1 }}</span>

 src/views/home/index.vue

@@ -99,7 +99,7 @@
            </div>

            <el-main v-loading="peopleKeypeopleLoading" element-loading-text="拼命加载中"
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                <el-table :data="peopleInfoList" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
@@ -145,7 +145,7 @@
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-show="!isMaoJiaLin" v-loading="keyPeopleLoading" element-loading-text="拼命加载中"
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">>
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">>
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -186,7 +186,7 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearSearchEquiment">清空</el-button>
            </div>
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <el-table :data="equimentTableData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" :row-class-name="tableRowClassName">
@@ -229,8 +229,8 @@
            :close-on-click-modal="true" class="land-details-box">
            <div class="header">
                <div>
                    小区名称：
                    <input type="text" v-model="landSearchAoiName" placeholder="请输入负责人名称" />
                    责任区名称：
                    <input type="text" v-model="landSearchAoiName" placeholder="请输入责任区名称" />
                </div>
                <div>
                    负责人：
@@ -244,7 +244,7 @@
                <el-button type="primary" icon="el-icon-delete" @click="clearLandDetailSearchValue">清空</el-button>
            </div>
            <el-main v-loading="landLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <el-table :data="landDetailArr" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
@@ -1112,7 +1112,7 @@
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.7)'
                background: 'rgba(0, 0, 0, 0.2)'
            })
            setTimeout(() => { loading.close() }, 1000)
        },
@@ -1769,6 +1769,9 @@

        // 获取设备分页数据
        getEquipmentPaging (params) {
            setTimeout(() => {
                this.equimentLoading = false
            }, 500)
            getEquipmentPaging({
                page: this.currentPage,
                count: this.pagesize,
@@ -1785,9 +1788,7 @@
                    this.equimentTableData = []
                    this.equimentPagingTotal = 0
                }
                setTimeout(() => {
                    this.equimentLoading = false
                }, 500)

            })
        },

@@ -2141,7 +2142,20 @@
            this.equimentSearchVal = ''
            this.equimentTableData = []
            this.equimentVisible = false
        }
        },

        // 获取所有派出所中心
        getAllPoliceStationCenter () {
            const center = this.getAllRegionCenter(this.policeStationOptions)
            console.log('center', center)
            this.$EventBus.$emit('toPosition', {
                siteJd: center[0] + 0.046,
                siteWd: center[1] - 0.36,
                siteGd: 36000,
                siteHeading: -3,
                sitePitch: -45
            })
        },
    },

    destroyed () {

 src/views/house/index.vue

@@ -1500,11 +1500,11 @@

            .housing-estate-info {
                .housing-title {
                    padding: 0 10px;
                    padding-left: 20px;
                    position: relative;
                    height: 40px;
                    height: 60px;
                    text-align: left;
                    line-height: 40px;
                    line-height: 60px;
                    font-size: 28px;
                    font-weight: bold;
                    z-index: 1;
@@ -1517,7 +1517,7 @@
                        right: 10px;
                        bottom: 4px;
                        background: linear-gradient(135deg,
                                rgb(33 150 243 / 74%),
                                rgb(233 202 154 / 74%),
                                rgb(254 254 254 / 0%));
                        z-index: -1;
                    }

 src/views/police/index.vue

@@ -12,7 +12,9 @@
<template>
    <div class="police-page container">
        <div v-show="boxShow" class="container-content">
            <div class="switch-box" v-show="!detailFlag">
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <div class="switch-box" v-show="!detailFlag && !equimentLoading">
                资源类别：
                <el-select v-model="typeValue" @change="navClick" placeholder="请选择" class="type-select-css">
                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
@@ -20,18 +22,18 @@
                </el-select>
            </div>

            <div class="list-show" v-if="!detailFlag">
                <div class="list-show" v-if="!detailFlag && !equimentLoading">
                <div class="search-box">
                    资源名称：
                    <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入…" />
                </div>

                <div class="list" ref="tableBox">

                    <el-table :data="equimentTableData"
                        :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', borderColor: '#324e75' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75', cursor: 'pointer' }"
                        :height="currentTableHeight" v-loading="equimentLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">
                            :height="currentTableHeight">
                        <el-table-column prop="newName" :show-overflow-tooltip="true" label="名称"
                            :min-width="typeValue == 0 || typeValue == 2 ? '56%' : '68%'"></el-table-column>
                        <el-table-column prop="status" label="状态"
@@ -62,8 +64,11 @@
                            :page-count="equimentPage.count" :pager-count="4" :current-page="equimentPage.currentPage"
                            @current-change="handleCurrentChange"></el-pagination>
                    </div>

                </div>
            </div>
            </el-main>


            <div class="track-box" v-show="detailFlag">
                <div class="track-box-info">
@@ -198,9 +203,11 @@
            videoPlayShow: false
        }
    },

    created () {
        window.addEventListener('resize', this.setTableHeight)
    },

    mounted () {
        this.$parent.$parent.resize('400px', true)

@@ -212,6 +219,7 @@
            this.setTableHeight()
        })
    },

    methods: {
        // 搜索框改变事件
        searchChange () {
@@ -236,6 +244,7 @@
            this.equimentLoading =true
            this.getEquipmentPaging({ type: this.navType })
        },

        // 设备分页处理
        handleCurrentChange (currentPage) {
            this.equimentPage.currentPage = currentPage
@@ -245,6 +254,9 @@

        // 获取设备分页数据
        getEquipmentPaging (params) {
            setTimeout(() => {
                this.equimentLoading = false
            }, 1000)
            getEquipmentPaging({ page: this.equimentPage.currentPage, count: this.equimentPage.pageSize, ...params, query: this.searchValue, dwbh: this.userInfo.dept_id }).then(res => {
                this.equimentTableData = []
                this.equimentPage.count = 0
@@ -317,9 +329,7 @@

                    this.equimentPage.total = 0
                }
                setTimeout(() => {
                    this.equimentLoading = false
                }, 500)

            })
        },

@@ -789,6 +799,11 @@
                white-space: nowrap;
                text-overflow: ellipsis;
            }

            :deep(.el-main) {
                padding: 0;
                width: 100%;
            }
        }

        .track-box {

 src/views/policeInfor/index.vue

@@ -188,7 +188,7 @@
                </div>
            </div>

            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) == '{}'" class="box no-data">暂无数据</div>
            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) == '{}'" class="box no-data">暂无警情</div>
        </el-dialog>

    </div>

 vue.config.js

@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://192.168.0.100:82",
                // target: "http://localhost:82",
                target: "http://192.168.0.100:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566