shuishen
2023-03-08 6627618e4fd4dd299b6de23cfb42a9486d6e035e
首页相关修改
4 files modified
30 ■■■■ changed files
src/api/home/equiment.js 4 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 7 ●●●●● patch | view | raw | blame | history
src/views/home/components/rightContainer.vue 9 ●●●●● patch | view | raw | blame | history
src/views/home/index.vue 10 ●●●● patch | view | raw | blame | history
src/api/home/equiment.js
@@ -23,7 +23,7 @@
// 获取手台分页数据 
export const getTalkEquimentPage = (params) => {
    return request({
        url: `/talkBackEquipment/talkBackEquipment/page`,
        url: `/api/talkBackEquipment/talkBackEquipment/page`,
        method: 'get',
        params: {
            ...params
@@ -34,7 +34,7 @@
// 获取执法记录仪分页数据 
export const getPoliceCameraEquimentPage = (params) => {
    return request({
        url: `/deviceChannelPoliceCamera/deviceChannelPoliceCamera/page`,
        url: `/api/deviceChannelPoliceCamera/deviceChannelPoliceCamera/page`,
        method: 'get',
        params: {
            ...params
src/components/map/index.vue
@@ -468,9 +468,9 @@
        this.$EventBus.$on('layerPolygonAdd', (params) => {
            if ('polygonName' in params) {
                that.layerPolygonAdd(params.layerName, params.positions, params.material, params.distanceDisplayCondition, params.polygonName, params.params, params.incident)
                that.layerPolygonAdd(params.layerName, params.positions, params.material, params.distanceDisplayCondition, params.polygonName, params.params, params.incident, params.setStyle)
            } else {
                that.layerPolygonAdd(params.layerName, params.positions, params.material, params.distanceDisplayCondition, 'polygon', params.params, params.incident)
                that.layerPolygonAdd(params.layerName, params.positions, params.material, params.distanceDisplayCondition, 'polygon', params.params, params.incident, params.setStyle)
            }
        })
@@ -827,7 +827,7 @@
         * @param {*} material 颜色
         * @param {*} distanceDisplayCondition 可见距离
         */
        layerPolygonAdd (layerName, positions, material, distanceDisplayCondition, polygonName, params, incident = (e) => { }) {
        layerPolygonAdd (layerName, positions, material, distanceDisplayCondition, polygonName, params, incident = (e) => { }, setStyle = {}) {
            if (!layersObjcect[layerName] || layersObjcect[layerName] == null) {
                this.mapAddLayer(layerName, 'VectorLayer')
@@ -841,6 +841,7 @@
                material: material,
                distanceDisplayCondition: distanceDisplayCondition,
                perPositionHeight: true,
                ...setStyle
            })
            // layersObjcect[layerName].addOverlay(polygon)
            polygonObj[polygonName].attrParams = params
src/views/home/components/rightContainer.vue
@@ -540,11 +540,10 @@
                            <br />
                            <span style="margin-left:10px;color:#91cc75">摄像头:${params.data.monitorCount}台</span>
                            <br />
                            <span style="margin-left:10px;color:#91cc75">执法记录仪:${params.data.phoneCount}台</span>
                            <span style="margin-left:10px;color:#fac858">执法记录仪:${params.data.phoneCount}台</span>
                            <br />
                            <span style="margin-left:10px;color:#91cc75">手台:${params.data.recorderCount}台</span>
                            <span style="margin-left:10px;color:#ee6666">手台:${params.data.recorderCount}台</span>
                            `
                        } else {
                            tipHtml = `${params.marker} 
                            <strong style="color: ${params.color}">${params.data.name} ${params.data.value}台</strong>
@@ -614,7 +613,7 @@
                            color: function (params) {
                                let colorList = []
                                if ('carCount' in params.data) {
                                    colorList = ['#4caf50', '#787878']
                                    colorList = ['#4caf50', '#787878', '#fac858', '#d766ee',]
                                } else {
                                    colorList = ['#5470FE', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
                                }
@@ -627,7 +626,7 @@
                                color: function (params) {
                                    let colorList = []
                                    if ('carCount' in params.data) {
                                        colorList = ['#4caf50', '#787878']
                                        colorList = ['#4caf50', '#787878', '#fac858', '#d766ee',]
                                    } else {
                                        colorList = ['#5470FE', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
                                    }
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-08 11:33:20
 * @LastEditTime: 2023-03-08 17:45:07
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -1581,10 +1581,10 @@
            switch (name) {
                case '执法记录仪':
                    console.log("red")
                    this.getPoliceCameraEquimentPage()
                    break
                case '手台':
                    console.log("yellow")
                    this.getTalkEquimentPage()
                    break
                default:
                    this.equimentCurrentSelect = {}
@@ -1658,13 +1658,13 @@
        getTalkEquimentPage (params) {
            getTalkEquimentPage(params).then(res => {
                res.data.data.records = []
            })
        },
        getPoliceCameraEquimentPage (params) {
            getPoliceCameraEquimentPage(params).then(res => {
                console.log(res)
            })
        },