~admin/srs-police-affairs.git

parent: 47c98f24 | patch | commit | ignore whitespace

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-02-17 450ed8fa0eac41631ad91c8a068a0b66467cdd1c

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

3 files modified

	src/views/home/components/leftContainer.vue	22 ●●●●● patch \| view \| raw \| blame \| history
	src/views/home/index.vue	37 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	8 ●●●●● patch \| view \| raw \| blame \| history

 src/views/home/components/leftContainer.vue

@@ -421,9 +421,9 @@
                        x: 'center',
                        y: 'center',
                        textStyle: {
                            color: "#fff",
                            fontSize: fontSize(14),
                            color: '#fff',
                            fontWeight: 'normal',
                            fontSize: fontSize(14)
                        }
                    }
                }
@@ -577,7 +577,7 @@
                    borderColor: 'rgba(8, 56, 185, 0.9)',
                    textStyle: {
                        color: '#fff',
                        fontSize: fontSize(14)
                        fontSize: fontSize(12)
                    }
                },
                color: myColor,
@@ -679,18 +679,17 @@
                    borderColor: 'rgba(8, 56, 185, 0.9)',
                    textStyle: {
                        color: '#fff',
                        fontSize: fontSize(14)
                        fontSize: fontSize(12)
                    }
                },
                xAxis: {
                    type: 'category',
                    data: xDate,

                    axisLabel: {
                        color: "#fff",
                        interval: 0,
                        rotate: 45,
                        fontSize: fontSize(12)
                        fontSize: fontSize(10)
                    },
                    axisLine: {
                        lineStyle: {
@@ -706,7 +705,7 @@
                    },
                    axisLabel: {
                        color: "#fff",
                        fontSize: fontSize(14)
                        fontSize: fontSize(12)
                    }
                },
                series: [
@@ -809,6 +808,7 @@
         */
        initkeyPersonOption (dataArr) {
            let options

            if (dataArr.length == 0) {
                options = {
                    title: {
@@ -816,9 +816,9 @@
                        x: 'center',
                        y: 'center',
                        textStyle: {
                            color: "#fff",
                            fontSize: fontSize(14),
                            color: '#fff',
                            fontWeight: 'normal',
                            fontSize: fontSize(14)
                        }
                    }
                }
@@ -836,6 +836,10 @@

                            msg = `${params.marker} ${params.name}<strong style="margin-left:10px">${msg}</strong>`
                            return msg
                        },
                        textStyle: {
                            color: '#fff',
                            fontSize: fontSize(12)
                        }
                    },
                    legend: {

 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-02-16 10:43:03
 * @LastEditTime: 2023-02-17 13:57:42
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -311,6 +311,10 @@
            class="land-details-box"
        >
            <div class="header">
                <div>
                    小区名称：
                    <input type="text" v-model="landSearchAoiName" placeholder="请输入负责人名称" />
                </div>
                <div>
                    负责人：
                    <input type="text" v-model="policeName" placeholder="请输入负责人名称" />
@@ -749,7 +753,10 @@
            peopleCallPhone: '',

            // 当前下拉选中的ID
            policeStaionID: ''
            policeStaionID: '',

            // 现有地搜索条件-小区名称
            landSearchAoiName: ''
        }
    },

@@ -1869,16 +1876,31 @@
        clearLandDetailSearchValue () {
            this.policeName = ''
            this.callPhone = ''
            this.landSearchAoiName = ''
            this.landPage.currentPage = 1
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage)
        },

        /**
         * @description: 现有地弹窗中搜索
         * @return {*}
         */
        searchLandDetail () {
            this.landPage.currentPage = 1
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone)
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
        },

        getLandDetail (type, id, current, policeName = '', phone = '') {
        /**
         * @description: 现有地详情弹窗分页
         * @param {*} currentPage 当前页数
         * @return {*}
         */
        landHandleCurrentChange (currentPage) {
            this.landPage.currentPage = currentPage
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
        },

        getLandDetail (type, id, current, policeName = '', phone = '', aoiName = '') {
            getLandDetail({
                type,
                policeStationId: this.policeStaionID == '1123598813738675201' || this.policeStaionID == '' ? id : '',
@@ -1886,6 +1908,7 @@
                current,
                policeName,
                phone,
                aoiName,
                size: this.landPage.pageSize
            }).then(res => {
                this.landDetailArr = []
@@ -1899,12 +1922,6 @@
                    this.landPage.total = 0
                }
            })
        },

        // 现有地详情弹窗分页
        landHandleCurrentChange (currentPage) {
            this.landPage.currentPage = currentPage
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone)
        },

        /**

 src/views/house/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-02-16 17:21:09
 * @LastEditTime: 2023-02-17 14:18:40
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -826,10 +826,10 @@
            this.$EventBus.$emit('addMxTileset', {
                titlesetName: 'sdTilesetLayer',
                // 内网
                titlesetUrl: 'http://10.141.11.11:18080/sf3d/361102/model/wanda/tileset.json',
                incident: that.getAoiByPtStd
                // titlesetUrl: 'http://10.141.11.11:18080/sf3d/361102/model/wanda/tileset.json',
                // 外网
                //titlesetUrl: 'http://192.168.0.112:18080/sf3d/361102/model/wanda/tileset.json'
                titlesetUrl: 'http://192.168.0.112:18080/sf3d/361102/model/wanda/tileset.json',
                incident: that.getAoiByPtStd
            })

			@@ -421,9 +421,9 @@
			x: 'center',
			y: 'center',
			textStyle: {
			color: "#fff",
			fontSize: fontSize(14),
			color: '#fff',
			fontWeight: 'normal',
			fontSize: fontSize(14)
			}
			}
			}
			@@ -577,7 +577,7 @@
			borderColor: 'rgba(8, 56, 185, 0.9)',
			textStyle: {
			color: '#fff',
			fontSize: fontSize(14)
			fontSize: fontSize(12)
			}
			},
			color: myColor,
			@@ -679,18 +679,17 @@
			borderColor: 'rgba(8, 56, 185, 0.9)',
			textStyle: {
			color: '#fff',
			fontSize: fontSize(14)
			fontSize: fontSize(12)
			}
			},
			xAxis: {
			type: 'category',
			data: xDate,

			axisLabel: {
			color: "#fff",
			interval: 0,
			rotate: 45,
			fontSize: fontSize(12)
			fontSize: fontSize(10)
			},
			axisLine: {
			lineStyle: {
			@@ -706,7 +705,7 @@
			},
			axisLabel: {
			color: "#fff",
			fontSize: fontSize(14)
			fontSize: fontSize(12)
			}
			},
			series: [
			@@ -809,6 +808,7 @@
			*/
			initkeyPersonOption (dataArr) {
			let options

			if (dataArr.length == 0) {
			options = {
			title: {
			@@ -816,9 +816,9 @@
			x: 'center',
			y: 'center',
			textStyle: {
			color: "#fff",
			fontSize: fontSize(14),
			color: '#fff',
			fontWeight: 'normal',
			fontSize: fontSize(14)
			}
			}
			}
			@@ -836,6 +836,10 @@

			msg = `${params.marker} ${params.name}<strong style="margin-left:10px">${msg}</strong>`
			return msg
			},
			textStyle: {
			color: '#fff',
			fontSize: fontSize(12)
			}
			},
			legend: {

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2022-08-18 16:18:17
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-02-16 10:43:03
			* @LastEditTime: 2023-02-17 13:57:42
			* @FilePath: \srs-police-affairs\src\views\home\index.vue
			* @Description: 小区-栋-层-房屋
			*
			@@ -311,6 +311,10 @@
			class="land-details-box"
			>
			<div class="header">
			<div>
			小区名称：
			<input type="text" v-model="landSearchAoiName" placeholder="请输入负责人名称" />
			</div>
			<div>
			负责人：
			<input type="text" v-model="policeName" placeholder="请输入负责人名称" />
			@@ -749,7 +753,10 @@
			peopleCallPhone: '',

			// 当前下拉选中的ID
			policeStaionID: ''
			policeStaionID: '',

			// 现有地搜索条件-小区名称
			landSearchAoiName: ''
			}
			},

			@@ -1869,16 +1876,31 @@
			clearLandDetailSearchValue () {
			this.policeName = ''
			this.callPhone = ''
			this.landSearchAoiName = ''
			this.landPage.currentPage = 1
			this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage)
			},

			/**
			* @description: 现有地弹窗中搜索
			* @return {*}
			*/
			searchLandDetail () {
			this.landPage.currentPage = 1
			this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone)
			this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
			},

			getLandDetail (type, id, current, policeName = '', phone = '') {
			/**
			* @description: 现有地详情弹窗分页
			* @param {*} currentPage 当前页数
			* @return {*}
			*/
			landHandleCurrentChange (currentPage) {
			this.landPage.currentPage = currentPage
			this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
			},

			getLandDetail (type, id, current, policeName = '', phone = '', aoiName = '') {
			getLandDetail({
			type,
			policeStationId: this.policeStaionID == '1123598813738675201' \|\| this.policeStaionID == '' ? id : '',
			@@ -1886,6 +1908,7 @@
			current,
			policeName,
			phone,
			aoiName,
			size: this.landPage.pageSize
			}).then(res => {
			this.landDetailArr = []
			@@ -1899,12 +1922,6 @@
			this.landPage.total = 0
			}
			})
			},

			// 现有地详情弹窗分页
			landHandleCurrentChange (currentPage) {
			this.landPage.currentPage = currentPage
			this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone)
			},

			/**