shuishen
2023-03-31 e88d2bca9652076d71cb6a8a64b25c226c61a91f
电子沙盘,首页
9 files modified
242 ■■■■ changed files
src/api/home/index.js 4 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 2 ●●● patch | view | raw | blame | history
src/views/activity/components/drawBtnBox.vue 7 ●●●● patch | view | raw | blame | history
src/views/activity/components/polylinePlot.vue 3 ●●●● patch | view | raw | blame | history
src/views/activity/components/publicIndex.vue 8 ●●●● patch | view | raw | blame | history
src/views/home/components/bottomContainer.vue 192 ●●●● patch | view | raw | blame | history
src/views/home/components/leftContainer.vue 10 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 12 ●●●●● patch | view | raw | blame | history
vue.config.js 4 ●●●● patch | view | raw | blame | history
src/api/home/index.js
@@ -127,7 +127,7 @@
    })
}
// 现有地模块
// 现有小区模块
export const getAreaStatisticInfo = (type, deptId) => {
    return request({
        url: `/api/policeStationInfo/policeStationInfo/getAreaStatisticInfo`,
@@ -163,7 +163,7 @@
    })
}
// 获取现有地详情弹窗
// 获取现有小区详情弹窗
export const getLandDetail = (params) => {
    return request({
        url: `/api/policeStationInfo/policeStationInfo/page`,
src/components/map/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-31 17:07:34
 * @LastEditTime: 2023-03-31 18:41:15
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
src/views/activity/components/drawBtnBox.vue
@@ -294,6 +294,9 @@
        addNewPolice (data, type, carType) {
            // 巡逻路线添加
            if (type == 'policecar' && carType == 1) {
                const maxHeight = data.altitude.split(',').reduce((pre, cur) => {
                    return cur > pre ? cur : pre
                }, 0)
                // 线坐标字符串
                let positionNewArr = this.$parent.convertPolylineOrPolygonPositionDate(data, 'add')
                // 范围面坐标串
@@ -301,7 +304,7 @@
                let positionStr = ''
                coords.forEach((item, index) => {
                    if (!(index == coords.length - 1)) {
                        positionStr += item[0] + ',' + item[1] + ';'
                        positionStr += item[0] + ',' + item[1] + ',' + maxHeight + ';'
                    }
                })
                let polygonSavePositionStr = positionStr + coords[0][0] + ',' + coords[0][1] + ';'
@@ -515,7 +518,7 @@
        // idid, carId警车id, color颜色, width巡逻路线范围宽度, type线面类型, position坐标
        updateActivityCar (params, overlay) {
            updateActivityCar(params).then(res => {
                if (res.data.success) {
                if (res.data) {
                    this.editPoliceStyle(params, overlay)
                    this.$message({
                        message: '保存成功',
src/views/activity/components/polylinePlot.vue
@@ -168,13 +168,14 @@
                color: this.chooseColor,
                width: this.lineWidth
            })
            this.lineEditVisible = false
        },
        // 添加警车和范围
        // carId警车id, position坐标, securityIdid, type线面类型,width缓存范围,color范围颜色
        addCarAndRange (params) {
            addCarAndRange(params).then(res => {
                this.lineEditVisible = false
                if (res.data.success) {
                    this.$parent.addNewPolice(res.data.data, 'policecar', params.type)
src/views/activity/components/publicIndex.vue
@@ -177,7 +177,7 @@
        closeActivityDetails () {
            this.$parent.cleartAllTimer()
            this.$refs.DRAWBTNBOX.removeDrawArrow()
            this.$refs.DRAWBTNBOX && this.$refs.DRAWBTNBOX.removeDrawArrow()
            this.$parent.showingSecurityId = ''
@@ -214,12 +214,12 @@
            this.policeSwitch = false
            this.arrowBtnSwitch = false
            this.polylineBtnSwitch = false
            this.$refs.VIDEOCONTROLBOX.closeVideo()
            this.$refs.VIDEOCONTROLBOX && this.$refs.VIDEOCONTROLBOX.closeVideo()
            this.$parent.currentTreeItem = ''
            this.$parent.activeActivityIndex = ''
            this.clearOrRemoveLayerAll('clear')
            this.$refs.DRAWBTNBOX.stopDraw()
            this.$refs.DRAWBTNBOX && this.$refs.DRAWBTNBOX.stopDraw()
        },
        addNewPlot (data) {
@@ -227,7 +227,7 @@
        },
        removeDrawArrow () {
            this.$refs.DRAWBTNBOX.removeDrawArrow()
            this.$refs.DRAWBTNBOX && this.$refs.DRAWBTNBOX.removeDrawArrow()
        },
        plotEdit (overlay, type) {
src/views/home/components/bottomContainer.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-01-13 15:52:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-29 23:08:43
 * @LastEditTime: 2023-03-31 21:53:11
 * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
 * @Description: 
 * 
@@ -332,105 +332,105 @@
        // 获取实时接警记录
        getAnswerPolices () {
            getAnswerPolices({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
                this.policeSituationRealtimeArr = []
            // getAnswerPolices({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id }).then(res => {
            //     this.policeSituationRealtimeArr = []
                if (res.data && res.data.length) {
                    this.policeSituationRealtimeArr = res.data.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
                    })
                } else {
                    this.policeSituationRealtimeArr = []
                }
                this.$emit('policeSituationChange')
            })
            // this.policeSituationRealtimeArr = [{
            //     ZDDWXZB: 117.97,
            //     ZDDWYZB: 28.45,
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // }]
            // this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            //     if (res.data && res.data.length) {
            //         this.policeSituationRealtimeArr = res.data.map((item, index) => {
            //             return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
            // })
            //     } else {
            //         this.policeSituationRealtimeArr = []
            //     }
            // this.$emit('policeSituationChange')
            // })
            this.policeSituationRealtimeArr = [{
                ZDDWXZB: 117.97,
                ZDDWYZB: 28.45,
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            }]
            this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            })
            this.$emit('policeSituationChange')
        },
        // 获取历史接警记录
src/views/home/components/leftContainer.vue
@@ -100,7 +100,7 @@
        </div>
        <div class="land-box" style="position: relative;">
            <div class="box">
                <div class="title">现有地</div>
                <div class="title">现有小区</div>
                <div class="sub-tab" v-show="isAllPoliceStation">
                    <div class="tab" :class="{ 'select-on-tab': tabTypeThree == 0 }" @click="landTabClick(0)">
                        <div class="tab-title-small">小区:</div>
@@ -1033,7 +1033,7 @@
        },
        /**
         * @description: 现有地切换
         * @description: 现有小区切换
         * @param {*} type
         * @return {*}
         */
@@ -1049,7 +1049,7 @@
        },
        /**
         * @description: 获取现有地数据
         * @description: 获取现有小区数据
         * @param {*} type
         * @param {*} deptId
         * @return {*}
@@ -1086,7 +1086,7 @@
        },
        /**
         * @description: 现有地图表渲染
         * @description: 现有小区图表渲染
         * @param {*} landData
         * @return {*}
         */
@@ -1112,7 +1112,7 @@
        },
        /**
         * @description: 现有地图表点击事件
         * @description: 现有小区图表点击事件
         * @return {*}
         */
        clickLandChart () {
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-03-24 16:55:40
 * @LastEditTime: 2023-03-31 21:58:49
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -636,7 +636,7 @@
            // 当前下拉选中的ID
            policeStaionID: '',
            // 现有地搜索条件-小区名称
            // 现有小区搜索条件-小区名称
            landSearchAoiName: '',
            flvPlayer: null,
@@ -776,9 +776,7 @@
                        this.policeStaionChecked = currentItem
                    } else {
                        this.initPoliceStationLayer()
                    }
                } else if (type == 2) {
@@ -2011,7 +2009,7 @@
        },
        /**
         * @description: 显示现有地弹窗列表
         * @description: 显示现有小区弹窗列表
         * @param {*} name
         * @param {*} type
         * @param {*} id
@@ -2037,7 +2035,7 @@
        },
        /**
         * @description: 现有地弹窗中搜索
         * @description: 现有小区弹窗中搜索
         * @return {*}
         */
        searchLandDetail () {
@@ -2047,7 +2045,7 @@
        },
        /**
         * @description: 现有地详情弹窗分页
         * @description: 现有小区详情弹窗分页
         * @param {*} currentPage 当前页数
         * @return {*}
         */
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