srs-police-affairs.git

parent: 75890183 | patch | commit | ignore whitespace

guanqb

2023-05-09 e7f18fa4a0212d5b9cfc7a24df28af2a843e23de

部署修改

4 files modified

	src/utils/CesiumHeatmap.js	11 ●●●●● patch \| view \| raw \| blame \| history
	src/views/home/components/rightContainer.vue	10 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	27 ●●●●● patch \| view \| raw \| blame \| history
	src/views/policeInfor/index.vue	174 ●●●●● patch \| view \| raw \| blame \| history

 src/utils/CesiumHeatmap.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-05-06 20:24:41
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-05-06 21:15:24
 * @LastEditTime: 2023-05-09 10:33:15
 * @FilePath: \srs-police-affairs\src\utils\CesiumHeatmap.js
 * @Description: 
 * 
@@ -29,11 +29,10 @@
                minOpacity: 0.1,              // the minimum opacity used if not given in the heatmap options object
                blur: 0.85,                   // the blur used if not given in the heatmap options object
                gradient: {                   // the gradient used if not given in the heatmap options object
                    '0.9': 'red',
                    '0.8': 'orange',
                    '0.7': 'yellow',
                    '0.5': 'blue',
                    '0.3': 'green',
                    '.3': 'blue',
                    '.65': 'yellow',
                    '.8': 'orange',
                    '.95': 'red'
                },
            }
        }

 src/views/home/components/rightContainer.vue

@@ -694,9 +694,15 @@
                let seriesData = dataArr.map(item => {
                    return { value: item.value, itemStyle: item.itemStyle }
                })
                let xData = dataArr.map((item) => {
                    let name = item.name.substring(0, 6) + '…'

                    return name
                })
                option = {
                    tooltip: {
                        trigger: "item",
                        confine: true,
                        formatter:
                            ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px;color:#5c7bd9">{c0}起</strong>',
                    },
@@ -713,7 +719,7 @@
                            inverse: true,
                            axisLine: { show: false },
                            axisTick: { show: false },
                            data: dataArr.map((item) => item.name),
                            data: dataArr.map(item => item.name),
                            axisLabel: {
                                rich: {
                                    nt1: {
@@ -780,7 +786,7 @@
                                lineHeight: fontSize(24),
                                fontSize: fontSize(10)
                            },
                            data: dataArr.reverse().map((item) => item.name),
                            data: xData.reverse(),
                        },
                    ],
                    series: [

 src/views/house/index.vue

@@ -1403,10 +1403,17 @@
                    //     siteGd: item.properties.szhfr + 240,
                    //     sitePitch: -80,
                    // })
                    // this.$EventBus.$emit("toPosition", {
                    //     siteJd: Number(homeCenter[0]) + 0.00006,
                    //     siteWd: Number(homeCenter[1]) - 0.00030,
                    //     siteGd: item.properties.szhfr + 40,
                    //     sitePitch: -45,
                    // })
                    this.$EventBus.$emit("toPosition", {
                        siteJd: Number(homeCenter[0]) + 0.00006,
                        siteWd: Number(homeCenter[1]) - 0.00030,
                        siteGd: item.properties.szhfr + 40,
                        ...item,
                        siteJd: Number(homeCenter[0]),
                        siteWd: Number(homeCenter[1]) - 0.0021,
                        siteGd: 240,
                        sitePitch: -45,
                    })
                    this.$EventBus.$emit("clearHouse3D")
@@ -1450,13 +1457,19 @@
            this.pictLoading = true
            if (!aoiArr) {
                this.$EventBus.$emit("clearHouse3D")
                // this.$EventBus.$emit("toPosition", {
                //     ...item,
                //     siteJd: Number(item.siteJd),
                //     siteWd: Number(item.siteWd) - 0.0021,
                //     siteGd: 600,
                //     sitePitch: -60,
                // })
                this.$EventBus.$emit("toPosition", {
                    ...item,
                    siteJd: Number(item.siteJd),
                    siteWd: Number(item.siteWd) - 0.0021,
                    siteGd: 600,
                    // siteGd: 1500,
                    sitePitch: -60,
                    siteGd: 240,
                    sitePitch: -45,
                })
            }
            this.buildingChoosed = item
@@ -2746,7 +2759,7 @@

                                .title {
                                    width: 50px;
                                    flex-shrink:0;
                                    flex-shrink: 0;
                                }

                                .detail {

 src/views/policeInfor/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-05-08 20:10:24
 * @LastEditTime: 2023-05-09 10:37:03
 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
 * @Description: 辖区管理
 * 
@@ -776,7 +776,7 @@
                global.viewer, // 视图层
                bounds, // 矩形坐标
                {
                    radius: 50,
                    radius: 10,
                    maxOpacity: .5,
                    minOpacity: 0,
                    blur: .75
@@ -809,6 +809,172 @@
                jjdwbh = this.userInfo.dept_id
            }

            // let arr = [
            //     {
            //         ZDDWXZB: 117.92,
            //         ZDDWYZB: 28.34
            //     },

            //     {
            //         ZDDWXZB: 118.19,
            //         ZDDWYZB: 28.69
            //     },

            //     {
            //         ZDDWXZB: 117.93,
            //         ZDDWYZB: 28.68
            //     },

            //     {
            //         ZDDWXZB: 117.94,
            //         ZDDWYZB: 28.67
            //     },

            //     {
            //         ZDDWXZB: 117.941,
            //         ZDDWYZB: 28.671
            //     },

            //     {
            //         ZDDWXZB: 117.9411,
            //         ZDDWYZB: 28.6711
            //     },

            //     {
            //         ZDDWXZB: 117.942,
            //         ZDDWYZB: 28.672
            //     },

            //     {
            //         ZDDWXZB: 117.9422,
            //         ZDDWYZB: 28.6722
            //     },

            //     {
            //         ZDDWXZB: 117.943,
            //         ZDDWYZB: 28.673
            //     },

            //     {
            //         ZDDWXZB: 117.9433,
            //         ZDDWYZB: 28.6733
            //     },

            //     {
            //         ZDDWXZB: 117.944,
            //         ZDDWYZB: 28.674
            //     },

            //     {
            //         ZDDWXZB: 117.945,
            //         ZDDWYZB: 28.675
            //     },


            //     {
            //         ZDDWXZB: 117.95,
            //         ZDDWYZB: 28.66
            //     },

            //     {
            //         ZDDWXZB: 117.96,
            //         ZDDWYZB: 28.65
            //     },

            //     {
            //         ZDDWXZB: 117.97,
            //         ZDDWYZB: 28.64
            //     },

            //     {
            //         ZDDWXZB: 117.98,
            //         ZDDWYZB: 28.63
            //     },

            //     {
            //         ZDDWXZB: 117.99,
            //         ZDDWYZB: 28.62
            //     },

            //     {
            //         ZDDWXZB: 118.00,
            //         ZDDWYZB: 28.61
            //     },

            //     {
            //         ZDDWXZB: 118.11,
            //         ZDDWYZB: 28.60
            //     },

            //     {
            //         ZDDWXZB: 118.12,
            //         ZDDWYZB: 28.59
            //     },

            //     {
            //         ZDDWXZB: 118.13,
            //         ZDDWYZB: 28.58
            //     },

            //     {
            //         ZDDWXZB: 118.131,
            //         ZDDWYZB: 28.581
            //     },

            //     {
            //         ZDDWXZB: 118.132,
            //         ZDDWYZB: 28.582
            //     },

            //     {
            //         ZDDWXZB: 118.133,
            //         ZDDWYZB: 28.583
            //     },

            //     {
            //         ZDDWXZB: 118.1331,
            //         ZDDWYZB: 28.5831
            //     },

            //     {
            //         ZDDWXZB: 118.1332,
            //         ZDDWYZB: 28.5832
            //     },

            //     {
            //         ZDDWXZB: 118.1333,
            //         ZDDWYZB: 28.5833
            //     },

            //     {
            //         ZDDWXZB: 118.134,
            //         ZDDWYZB: 28.584
            //     },

            //     {
            //         ZDDWXZB: 118.135,
            //         ZDDWYZB: 28.585
            //     },

            //     {
            //         ZDDWXZB: 118.136,
            //         ZDDWYZB: 28.586
            //     },

            //     {
            //         ZDDWXZB: 118.14,
            //         ZDDWYZB: 28.57
            //     },

            //     {
            //         ZDDWXZB: 118.15,
            //         ZDDWYZB: 28.56
            //     }
            // ]

            // arr.forEach(item => {

            // })
            getAlarmList({ ...params, size: 999, jjdwbh, type: 3, bjlx: this.policeInforValue }).then(res => {
                if (res.data.data.length > 0) {
                    this.historyPoliceInforData = res.data.data.map((item, index) => {
@@ -820,13 +986,11 @@


                        if (item.ZDDWXZB && item.ZDDWXZB != '' && item.ZDDWXZB > 0 && item.ZDDWXZB > 73) {
                            this.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 1 })
                            this.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 23 })
                        }

                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
                    })


                } else {
                    // this.pages.total = 0
                    this.historyPoliceInforData = []

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2023-05-06 20:24:41
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-05-06 21:15:24
			* @LastEditTime: 2023-05-09 10:33:15
			* @FilePath: \srs-police-affairs\src\utils\CesiumHeatmap.js
			* @Description:
			*
			@@ -29,11 +29,10 @@
			minOpacity: 0.1, // the minimum opacity used if not given in the heatmap options object
			blur: 0.85, // the blur used if not given in the heatmap options object
			gradient: { // the gradient used if not given in the heatmap options object
			'0.9': 'red',
			'0.8': 'orange',
			'0.7': 'yellow',
			'0.5': 'blue',
			'0.3': 'green',
			'.3': 'blue',
			'.65': 'yellow',
			'.8': 'orange',
			'.95': 'red'
			},
			}
			}

			@@ -694,9 +694,15 @@
			let seriesData = dataArr.map(item => {
			return { value: item.value, itemStyle: item.itemStyle }
			})
			let xData = dataArr.map((item) => {
			let name = item.name.substring(0, 6) + '…'

			return name
			})
			option = {
			tooltip: {
			trigger: "item",
			confine: true,
			formatter:
			' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px;color:#5c7bd9">{c0}起</strong>',
			},
			@@ -713,7 +719,7 @@
			inverse: true,
			axisLine: { show: false },
			axisTick: { show: false },
			data: dataArr.map((item) => item.name),
			data: dataArr.map(item => item.name),
			axisLabel: {
			rich: {
			nt1: {
			@@ -780,7 +786,7 @@
			lineHeight: fontSize(24),
			fontSize: fontSize(10)
			},
			data: dataArr.reverse().map((item) => item.name),
			data: xData.reverse(),
			},
			],
			series: [

			@@ -1403,10 +1403,17 @@
			// siteGd: item.properties.szhfr + 240,
			// sitePitch: -80,
			// })
			// this.$EventBus.$emit("toPosition", {
			// siteJd: Number(homeCenter[0]) + 0.00006,
			// siteWd: Number(homeCenter[1]) - 0.00030,
			// siteGd: item.properties.szhfr + 40,
			// sitePitch: -45,
			// })
			this.$EventBus.$emit("toPosition", {
			siteJd: Number(homeCenter[0]) + 0.00006,
			siteWd: Number(homeCenter[1]) - 0.00030,
			siteGd: item.properties.szhfr + 40,
			...item,
			siteJd: Number(homeCenter[0]),
			siteWd: Number(homeCenter[1]) - 0.0021,
			siteGd: 240,
			sitePitch: -45,
			})
			this.$EventBus.$emit("clearHouse3D")
			@@ -1450,13 +1457,19 @@
			this.pictLoading = true
			if (!aoiArr) {
			this.$EventBus.$emit("clearHouse3D")
			// this.$EventBus.$emit("toPosition", {
			// ...item,
			// siteJd: Number(item.siteJd),
			// siteWd: Number(item.siteWd) - 0.0021,
			// siteGd: 600,
			// sitePitch: -60,
			// })
			this.$EventBus.$emit("toPosition", {
			...item,
			siteJd: Number(item.siteJd),
			siteWd: Number(item.siteWd) - 0.0021,
			siteGd: 600,
			// siteGd: 1500,
			sitePitch: -60,
			siteGd: 240,
			sitePitch: -45,
			})
			}
			this.buildingChoosed = item
			@@ -2746,7 +2759,7 @@

			.title {
			width: 50px;
			flex-shrink:0;
			flex-shrink: 0;
			}

			.detail {

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2022-08-18 16:18:17
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-05-08 20:10:24
			* @LastEditTime: 2023-05-09 10:37:03
			* @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
			* @Description: 辖区管理
			*
			@@ -776,7 +776,7 @@
			global.viewer, // 视图层
			bounds, // 矩形坐标
			{
			radius: 50,
			radius: 10,
			maxOpacity: .5,
			minOpacity: 0,
			blur: .75
			@@ -809,6 +809,172 @@
			jjdwbh = this.userInfo.dept_id
			}

			// let arr = [
			// {
			// ZDDWXZB: 117.92,
			// ZDDWYZB: 28.34
			// },

			// {
			// ZDDWXZB: 118.19,
			// ZDDWYZB: 28.69
			// },

			// {
			// ZDDWXZB: 117.93,
			// ZDDWYZB: 28.68
			// },

			// {
			// ZDDWXZB: 117.94,
			// ZDDWYZB: 28.67
			// },

			// {
			// ZDDWXZB: 117.941,
			// ZDDWYZB: 28.671
			// },

			// {
			// ZDDWXZB: 117.9411,
			// ZDDWYZB: 28.6711
			// },

			// {
			// ZDDWXZB: 117.942,
			// ZDDWYZB: 28.672
			// },

			// {
			// ZDDWXZB: 117.9422,
			// ZDDWYZB: 28.6722
			// },

			// {
			// ZDDWXZB: 117.943,
			// ZDDWYZB: 28.673
			// },

			// {
			// ZDDWXZB: 117.9433,
			// ZDDWYZB: 28.6733
			// },

			// {
			// ZDDWXZB: 117.944,
			// ZDDWYZB: 28.674
			// },

			// {
			// ZDDWXZB: 117.945,
			// ZDDWYZB: 28.675
			// },


			// {
			// ZDDWXZB: 117.95,
			// ZDDWYZB: 28.66
			// },

			// {
			// ZDDWXZB: 117.96,
			// ZDDWYZB: 28.65
			// },

			// {
			// ZDDWXZB: 117.97,
			// ZDDWYZB: 28.64
			// },

			// {
			// ZDDWXZB: 117.98,
			// ZDDWYZB: 28.63
			// },

			// {
			// ZDDWXZB: 117.99,
			// ZDDWYZB: 28.62
			// },

			// {
			// ZDDWXZB: 118.00,
			// ZDDWYZB: 28.61
			// },

			// {
			// ZDDWXZB: 118.11,
			// ZDDWYZB: 28.60
			// },

			// {
			// ZDDWXZB: 118.12,
			// ZDDWYZB: 28.59
			// },

			// {
			// ZDDWXZB: 118.13,
			// ZDDWYZB: 28.58
			// },

			// {
			// ZDDWXZB: 118.131,
			// ZDDWYZB: 28.581
			// },

			// {
			// ZDDWXZB: 118.132,
			// ZDDWYZB: 28.582
			// },

			// {
			// ZDDWXZB: 118.133,
			// ZDDWYZB: 28.583
			// },

			// {
			// ZDDWXZB: 118.1331,
			// ZDDWYZB: 28.5831
			// },

			// {
			// ZDDWXZB: 118.1332,
			// ZDDWYZB: 28.5832
			// },

			// {
			// ZDDWXZB: 118.1333,
			// ZDDWYZB: 28.5833
			// },

			// {
			// ZDDWXZB: 118.134,
			// ZDDWYZB: 28.584
			// },

			// {
			// ZDDWXZB: 118.135,
			// ZDDWYZB: 28.585
			// },

			// {
			// ZDDWXZB: 118.136,
			// ZDDWYZB: 28.586
			// },

			// {
			// ZDDWXZB: 118.14,
			// ZDDWYZB: 28.57
			// },

			// {
			// ZDDWXZB: 118.15,
			// ZDDWYZB: 28.56
			// }
			// ]

			// arr.forEach(item => {

			// })
			getAlarmList({ ...params, size: 999, jjdwbh, type: 3, bjlx: this.policeInforValue }).then(res => {
			if (res.data.data.length > 0) {
			this.historyPoliceInforData = res.data.data.map((item, index) => {
			@@ -820,13 +986,11 @@


			if (item.ZDDWXZB && item.ZDDWXZB != '' && item.ZDDWXZB > 0 && item.ZDDWXZB > 73) {
			this.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 1 })
			this.heatMapData.push({ x: Number(item.ZDDWXZB), y: Number(item.ZDDWYZB), value: 23 })
			}

			return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
			})


			} else {
			// this.pages.total = 0
			this.historyPoliceInforData = []