~admin/srs-police-affairs.git

parent: 9f3fd4c7 | patch | commit | ignore whitespace

guanqb

2023-05-07 276849adaf8fb9faff15c64f88e5abfbced5daa6

3 files modified

	src/views/home/components/leftContainer.vue	86 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	2 ●●●●● patch \| view \| raw \| blame \| history
	src/views/policeInfor/index.vue	15 ●●●●● patch \| view \| raw \| blame \| history

 src/views/home/components/leftContainer.vue

@@ -463,7 +463,7 @@
                })
            }

            homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate1, yDate2, ['#53eefe', '#51d5f1', '#133d6b'], ['#8b25c1', '#b81fee', '#421784']))
            homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate1, yDate2, ['#53eefe'], ['#8b25c1', '#b81fee', '#421784']))
        },

        /**
@@ -549,28 +549,30 @@
                            },
                            itemStyle: {
                                normal: {
                                    color: function (params) {
                                        return new global.echarts.graphic.LinearGradient(
                                            0, 0, 0, 1,
                                            [
                                                { offset: 0, color: colors1[0] },
                                                { offset: 0.5, color: colors1[1] },
                                                { offset: 1, color: colors1[2] },
                                            ]
                                        )
                                    }
                                    color: colors1[0]
                                    // color: function (params) {
                                    //     return new global.echarts.graphic.LinearGradient(
                                    //         0, 0, 0, 1,
                                    //         [
                                    //             { offset: 0, color: colors1[0] },
                                    //             { offset: 0.5, color: colors1[1] },
                                    //             { offset: 1, color: colors1[2] },
                                    //         ]
                                    //     )
                                    // }
                                },
                                emphasis: {
                                    color: function (params) {
                                        return new global.echarts.graphic.LinearGradient(
                                            0, 0, 0, 1,
                                            [
                                                { offset: 0, color: colors1[2] },
                                                { offset: 0.7, color: colors1[1] },
                                                { offset: 1, color: colors1[0] }
                                            ]
                                        )
                                    }
                                    color: colors1[0]
                                    // color: function (params) {
                                    //     return new global.echarts.graphic.LinearGradient(
                                    //         0, 0, 0, 1,
                                    //         [
                                    //             { offset: 0, color: colors1[2] },
                                    //             { offset: 0.7, color: colors1[1] },
                                    //             { offset: 1, color: colors1[0] }
                                    //         ]
                                    //     )
                                    // }
                                }
                            },
                        },
@@ -586,28 +588,30 @@
                            },
                            itemStyle: {
                                normal: {
                                    color: function (params) {
                                        return new global.echarts.graphic.LinearGradient(
                                            0, 0, 0, 1,
                                            [
                                                { offset: 0, color: colors2[2] },
                                                { offset: 0.5, color: colors2[1] },
                                                { offset: 1, color: colors2[0] },
                                            ]
                                        )
                                    }
                                    color: colors2[0]
                                    // color: function (params) {
                                    //     return new global.echarts.graphic.LinearGradient(
                                    //         0, 0, 0, 1,
                                    //         [
                                    //             { offset: 0, color: colors2[2] },
                                    //             { offset: 0.5, color: colors2[1] },
                                    //             { offset: 1, color: colors2[0] },
                                    //         ]
                                    //     )
                                    // }
                                },
                                emphasis: {
                                    color: function (params) {
                                        return new global.echarts.graphic.LinearGradient(
                                            0, 0, 0, 1,
                                            [
                                                { offset: 0, color: colors2[0] },
                                                { offset: 0.7, color: colors2[1] },
                                                { offset: 1, color: colors2[2] }
                                            ]
                                        )
                                    }
                                    color: colors2[0]
                                    // color: function (params) {
                                    //     return new global.echarts.graphic.LinearGradient(
                                    //         0, 0, 0, 1,
                                    //         [
                                    //             { offset: 0, color: colors2[0] },
                                    //             { offset: 0.7, color: colors2[1] },
                                    //             { offset: 1, color: colors2[2] }
                                    //         ]
                                    //     )
                                    // }
                                }
                            },
                        },

 src/views/house/index.vue

@@ -1411,7 +1411,7 @@
            console.log('residentDetailsClick--then')
            let residentId = params.std_addr_id.split('|')[2]
            this.getResident3DData(residentId, "361102", params.sname)
            this.getVillagePersonInfo(residentId)
            this.getVillagePersonInfo(params.uid)
            // this.houseDate = [
            //     { realName: '张三', phone: '17755556666', cardNo: '123456999911223344', personType: 1, status: 2, censusAddress: '湖北省武汉市江汉区', relation: '夫妻' },
            //     { realName: '李四', phone: '17755556666', cardNo: '123456999911223344', personType: 0, status: 2, censusAddress: '湖北省武汉市江汉区', relation: '夫妻' },

 src/views/policeInfor/index.vue

@@ -358,13 +358,13 @@
    computed: {
        whetherPosition () {
            return (row) => {
                return !(row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0)
                return !(row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0 && row.ZDDWXZB > 73)
            }
        },

        positionColor () {
            return (row) => {
                if (row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0) {
                if (row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0 && row.ZDDWXZB > 73) {
                    return "#1AFA29"
                } else {
                    return "#ccc"
@@ -589,7 +589,7 @@
                global.viewer, // 视图层
                bounds, // 矩形坐标
                {
                    radius: 40,
                    radius: 5,
                    maxOpacity: .5,
                    minOpacity: 0,
                    blur: .75
@@ -599,7 +599,7 @@
            let valueMax = 100
            // add data to heatmap
            //获取动态数据
            heatMap.setWGS84Data(valueMin, valueMax, data)
            heatMap.setWGS84Data(valueMin, 10, data)
            this.heatMap = heatMap
        },

@@ -625,8 +625,8 @@
                        if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')


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

                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
@@ -851,9 +851,10 @@
        loading && loading.close()

        if (this.heatMap != null) {
            this.heatMap.removeLayer()
            this.heatMap.show(false)
        }


        window.removeEventListener('resize', this.setTableHeight)

        policeInforSiteLayer != null && policeInforSiteLayer.remove()

			@@ -463,7 +463,7 @@
			})
			}

			homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate1, yDate2, ['#53eefe', '#51d5f1', '#133d6b'], ['#8b25c1', '#b81fee', '#421784']))
			homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate1, yDate2, ['#53eefe'], ['#8b25c1', '#b81fee', '#421784']))
			},

			/**
			@@ -549,28 +549,30 @@
			},
			itemStyle: {
			normal: {
			color: function (params) {
			return new global.echarts.graphic.LinearGradient(
			0, 0, 0, 1,
			[
			{ offset: 0, color: colors1[0] },
			{ offset: 0.5, color: colors1[1] },
			{ offset: 1, color: colors1[2] },
			]
			)
			}
			color: colors1[0]
			// color: function (params) {
			// return new global.echarts.graphic.LinearGradient(
			// 0, 0, 0, 1,
			// [
			// { offset: 0, color: colors1[0] },
			// { offset: 0.5, color: colors1[1] },
			// { offset: 1, color: colors1[2] },
			// ]
			// )
			// }
			},
			emphasis: {
			color: function (params) {
			return new global.echarts.graphic.LinearGradient(
			0, 0, 0, 1,
			[
			{ offset: 0, color: colors1[2] },
			{ offset: 0.7, color: colors1[1] },
			{ offset: 1, color: colors1[0] }
			]
			)
			}
			color: colors1[0]
			// color: function (params) {
			// return new global.echarts.graphic.LinearGradient(
			// 0, 0, 0, 1,
			// [
			// { offset: 0, color: colors1[2] },
			// { offset: 0.7, color: colors1[1] },
			// { offset: 1, color: colors1[0] }
			// ]
			// )
			// }
			}
			},
			},
			@@ -586,28 +588,30 @@
			},
			itemStyle: {
			normal: {
			color: function (params) {
			return new global.echarts.graphic.LinearGradient(
			0, 0, 0, 1,
			[
			{ offset: 0, color: colors2[2] },
			{ offset: 0.5, color: colors2[1] },
			{ offset: 1, color: colors2[0] },
			]
			)
			}
			color: colors2[0]
			// color: function (params) {
			// return new global.echarts.graphic.LinearGradient(
			// 0, 0, 0, 1,
			// [
			// { offset: 0, color: colors2[2] },
			// { offset: 0.5, color: colors2[1] },
			// { offset: 1, color: colors2[0] },
			// ]
			// )
			// }
			},
			emphasis: {
			color: function (params) {
			return new global.echarts.graphic.LinearGradient(
			0, 0, 0, 1,
			[
			{ offset: 0, color: colors2[0] },
			{ offset: 0.7, color: colors2[1] },
			{ offset: 1, color: colors2[2] }
			]
			)
			}
			color: colors2[0]
			// color: function (params) {
			// return new global.echarts.graphic.LinearGradient(
			// 0, 0, 0, 1,
			// [
			// { offset: 0, color: colors2[0] },
			// { offset: 0.7, color: colors2[1] },
			// { offset: 1, color: colors2[2] }
			// ]
			// )
			// }
			}
			},
			},

			@@ -1411,7 +1411,7 @@
			console.log('residentDetailsClick--then')
			let residentId = params.std_addr_id.split('\|')[2]
			this.getResident3DData(residentId, "361102", params.sname)
			this.getVillagePersonInfo(residentId)
			this.getVillagePersonInfo(params.uid)
			// this.houseDate = [
			// { realName: '张三', phone: '17755556666', cardNo: '123456999911223344', personType: 1, status: 2, censusAddress: '湖北省武汉市江汉区', relation: '夫妻' },
			// { realName: '李四', phone: '17755556666', cardNo: '123456999911223344', personType: 0, status: 2, censusAddress: '湖北省武汉市江汉区', relation: '夫妻' },

			@@ -358,13 +358,13 @@
			computed: {
			whetherPosition () {
			return (row) => {
			return !(row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0)
			return !(row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0 && row.ZDDWXZB > 73)
			}
			},

			positionColor () {
			return (row) => {
			if (row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0) {
			if (row.ZDDWXZB && row.ZDDWXZB != 0 && row.ZDDWYZB && row.ZDDWYZB != 0 && row.ZDDWXZB > 73) {
			return "#1AFA29"
			} else {
			return "#ccc"
			@@ -589,7 +589,7 @@
			global.viewer, // 视图层
			bounds, // 矩形坐标
			{
			radius: 40,
			radius: 5,
			maxOpacity: .5,
			minOpacity: 0,
			blur: .75
			@@ -599,7 +599,7 @@
			let valueMax = 100
			// add data to heatmap
			//获取动态数据
			heatMap.setWGS84Data(valueMin, valueMax, data)
			heatMap.setWGS84Data(valueMin, 10, data)
			this.heatMap = heatMap
			},

			@@ -625,8 +625,8 @@
			if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')


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

			return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
			@@ -851,9 +851,10 @@
			loading && loading.close()

			if (this.heatMap != null) {
			this.heatMap.removeLayer()
			this.heatMap.show(false)
			}


			window.removeEventListener('resize', this.setTableHeight)

			policeInforSiteLayer != null && policeInforSiteLayer.remove()