~admin/srs-police-affairs.git

parent: 2f397b19 | patch | commit | ignore whitespace

guanqb

2023-04-05 e48903bf53af065d6edbd6ee5bd1142b07d13e5d

首页聚合样式

4 files modified

	src/components/map/index.vue	8 ●●●●● patch \| view \| raw \| blame \| history
	src/views/home/index.vue	8 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	26 ●●●●● patch \| view \| raw \| blame \| history
	vue.config.js	4 ●●●●● patch \| view \| raw \| blame \| history

 src/components/map/index.vue

@@ -744,7 +744,7 @@
         * @param {*} layerName 图层名称
         * @param {*} type 图层类型
         */
        mapAddLayer (layerName, type) {
        mapAddLayer (layerName, type, ClusterLayerType) {
            if (type == 'VectorLayer') {
                if (!layersObjcect[layerName]) layersObjcect[layerName] = null

@@ -753,9 +753,8 @@
                layersObjcect[layerName].addTo(global.viewer)
            } else if (type == 'ClusterLayer') {
                if (!layersObjcect[layerName]) layersObjcect[layerName] = null

                layersObjcect[layerName] = new global.DC.ClusterLayer(layerName, {
                    pixelRange: 40
                    pixelRange: 40, style: ClusterLayerType
                })

                layersObjcect[layerName].addTo(global.viewer)
@@ -831,7 +830,7 @@
            far: Number.MAX_VALUE //最远距离
        }, incident = (e) => { }, mouseOverIncident = (e) => { }, mouseOutIncident = (e) => { }, pointMouseMove = (e) => { }) {
            if (!layersObjcect[layerName] || layersObjcect[layerName] == null) {
                this.mapAddLayer(layerName, layerType)
                this.mapAddLayer(layerName, layerType, params.ClusterLayerType)
            }

            let pointElement
@@ -844,6 +843,7 @@
                pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 4), params.url)
                pointElement.setStyle(params.setStyle)
                pointElement.size = [32, 32]
                pointElement.style = "clustering"
                pointElement.attrParams = params
                layersObjcect[layerName].addOverlay(pointElement)
                pointElement.on(global.DC.MouseEventType.CLICK, incident)

 src/views/home/index.vue

@@ -589,13 +589,14 @@

                    if (item.X && item.X != '' && item.Y && item.Y != '') {
                        this.$EventBus.$emit('layerPointAdd', {
                            layerName: 'keypeopleslay',
                            layerName: 'keypeopleslayer',
                            type: "billboard",
                            layerType: 'ClusterLayer',
                            params: {
                                lng: Number(item.X),
                                lat: Number(item.Y),
                                url: '/img/icon/keypeople.png'
                                url: '/img/icon/keypeople.png',
                                ClusterLayerType: "clustering"
                            }
                        })
                    }
@@ -609,7 +610,8 @@
                            params: {
                                lng: Number(item.x),
                                lat: Number(item.y),
                                url: '/img/icon/school.png'
                                url: '/img/icon/school.png',
                                ClusterLayerType: "circle"
                            }
                        })
                    }

 src/views/house/index.vue

@@ -187,7 +187,7 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -201,7 +201,8 @@
                            :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'comeOut')"
                            empty-text="暂无出入口数据">
                            :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                            <el-table-column prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -214,7 +215,8 @@
                            :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'park')"
                            empty-text="暂无停车场数据">
                            :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
                            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                            <el-table-column prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -227,7 +229,9 @@
                            :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'business')"
                            @sort-change="sortDevName" empty-text="暂无商场数据">
                            @sort-change="sortDevName" :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading"
                            element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                            element-loading-background="rgba(0, 0, 0, 0.2)">
                            <el-table-column sortable="custom" prop="name" label="名称" width="180"
                                :show-overflow-tooltip="true"></el-table-column>
                            <el-table-column prop="x" label="经度" width="100"></el-table-column>
@@ -418,9 +422,11 @@
        return {
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            houseDeepLoading: false,
            peopleNoDataText: ' ',
            jqNoDataText: ' ',
            residentNoDataText: ' ',
            houseDeepNoDataText: ' ',
            keyPeopleLoading: false,
            policeInfoLoading: false,
            isHaveNoPic: false,
@@ -618,6 +624,18 @@
                layerName: "deepDataLayer",
                type: "VectorLayer",
            })
            this.houseDeepLoading = true
            this.houseDeepNoDataText = ' '
            setTimeout(() => {
                this.houseDeepLoading = false
                // if (comeOutData.length && type == 2) {
                //     this.houseDeepNoDataText = '暂无出入口数据'
                // } else if (parkingLotData.length && type == 3) {
                //     this.houseDeepNoDataText = '暂无停车场数据'
                // } else if (businessData.length && type == 4) {
                //     this.houseDeepNoDataText = '暂无商场数据'
                // }
            }, 500)
        },

        /**

 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

			@@ -744,7 +744,7 @@
			* @param {*} layerName 图层名称
			* @param {*} type 图层类型
			*/
			mapAddLayer (layerName, type) {
			mapAddLayer (layerName, type, ClusterLayerType) {
			if (type == 'VectorLayer') {
			if (!layersObjcect[layerName]) layersObjcect[layerName] = null

			@@ -753,9 +753,8 @@
			layersObjcect[layerName].addTo(global.viewer)
			} else if (type == 'ClusterLayer') {
			if (!layersObjcect[layerName]) layersObjcect[layerName] = null

			layersObjcect[layerName] = new global.DC.ClusterLayer(layerName, {
			pixelRange: 40
			pixelRange: 40, style: ClusterLayerType
			})

			layersObjcect[layerName].addTo(global.viewer)
			@@ -831,7 +830,7 @@
			far: Number.MAX_VALUE //最远距离
			}, incident = (e) => { }, mouseOverIncident = (e) => { }, mouseOutIncident = (e) => { }, pointMouseMove = (e) => { }) {
			if (!layersObjcect[layerName] \|\| layersObjcect[layerName] == null) {
			this.mapAddLayer(layerName, layerType)
			this.mapAddLayer(layerName, layerType, params.ClusterLayerType)
			}

			let pointElement
			@@ -844,6 +843,7 @@
			pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 4), params.url)
			pointElement.setStyle(params.setStyle)
			pointElement.size = [32, 32]
			pointElement.style = "clustering"
			pointElement.attrParams = params
			layersObjcect[layerName].addOverlay(pointElement)
			pointElement.on(global.DC.MouseEventType.CLICK, incident)

			@@ -589,13 +589,14 @@

			if (item.X && item.X != '' && item.Y && item.Y != '') {
			this.$EventBus.$emit('layerPointAdd', {
			layerName: 'keypeopleslay',
			layerName: 'keypeopleslayer',
			type: "billboard",
			layerType: 'ClusterLayer',
			params: {
			lng: Number(item.X),
			lat: Number(item.Y),
			url: '/img/icon/keypeople.png'
			url: '/img/icon/keypeople.png',
			ClusterLayerType: "clustering"
			}
			})
			}
			@@ -609,7 +610,8 @@
			params: {
			lng: Number(item.x),
			lat: Number(item.y),
			url: '/img/icon/school.png'
			url: '/img/icon/school.png',
			ClusterLayerType: "circle"
			}
			})
			}

			@@ -187,7 +187,7 @@
			<!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
			{{ value.properties.fojcu }}
			<!-- <div class="flow"></div>
			<div class="warning"></div>-->
			<div class="warning"></div>-->
			</div>
			</div>
			</div>
			@@ -201,7 +201,8 @@
			:header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
			:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
			:row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'comeOut')"
			empty-text="暂无出入口数据">
			:empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
			element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
			<el-table-column prop="name" label="名称" width="180"
			:show-overflow-tooltip="true"></el-table-column>
			<el-table-column prop="x" label="经度" width="100"></el-table-column>
			@@ -214,7 +215,8 @@
			:header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
			:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
			:row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'park')"
			empty-text="暂无停车场数据">
			:empty-text="houseDeepNoDataText" v-loading="houseDeepLoading" element-loading-text="拼命加载中"
			element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
			<el-table-column prop="name" label="名称" width="180"
			:show-overflow-tooltip="true"></el-table-column>
			<el-table-column prop="x" label="经度" width="100"></el-table-column>
			@@ -227,7 +229,9 @@
			:header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
			:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
			:row-class-name="tableRowClassName" @row-click="deepDataRowClick($event, 'business')"
			@sort-change="sortDevName" empty-text="暂无商场数据">
			@sort-change="sortDevName" :empty-text="houseDeepNoDataText" v-loading="houseDeepLoading"
			element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
			element-loading-background="rgba(0, 0, 0, 0.2)">
			<el-table-column sortable="custom" prop="name" label="名称" width="180"
			:show-overflow-tooltip="true"></el-table-column>
			<el-table-column prop="x" label="经度" width="100"></el-table-column>
			@@ -418,9 +422,11 @@
			return {
			// 下拉搜索--树状数据相关
			searchTreeShowFlag: false,
			houseDeepLoading: false,
			peopleNoDataText: ' ',
			jqNoDataText: ' ',
			residentNoDataText: ' ',
			houseDeepNoDataText: ' ',
			keyPeopleLoading: false,
			policeInfoLoading: false,
			isHaveNoPic: false,
			@@ -618,6 +624,18 @@
			layerName: "deepDataLayer",
			type: "VectorLayer",
			})
			this.houseDeepLoading = true
			this.houseDeepNoDataText = ' '
			setTimeout(() => {
			this.houseDeepLoading = false
			// if (comeOutData.length && type == 2) {
			// this.houseDeepNoDataText = '暂无出入口数据'
			// } else if (parkingLotData.length && type == 3) {
			// this.houseDeepNoDataText = '暂无停车场数据'
			// } else if (businessData.length && type == 4) {
			// this.houseDeepNoDataText = '暂无商场数据'
			// }
			}, 500)
			},

			/**

			@@ -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