~admin/srs-police-affairs.git

parent: 78900792 | patch | commit | ignore whitespace

shuishen

2023-03-10 f1641ef4a6f9c2793e77356ba9ddfbb8f4c94396

部分修改

5 files modified

	src/components/map/index.vue	9 ●●●●● patch \| view \| raw \| blame \| history
	src/views/home/components/leftContainer.vue	22 ●●●●● patch \| view \| raw \| blame \| history
	src/views/home/index.vue	16 ●●●●● patch \| view \| raw \| blame \| history
	src/views/house/index.vue	62 ●●●●● patch \| view \| raw \| blame \| history
	src/views/police/index.vue	17 ●●●●● patch \| view \| raw \| blame \| history

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-09 10:50:09
 * @LastEditTime: 2023-03-10 09:23:24
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -603,6 +603,13 @@
            // 天地图 影像
            this.imgtype = 0
            baseLayers != null && global.viewer.imageryLayers.remove(baseLayers)

            // baseLayers = global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_YX}/{z}/{x}/{y}.png`,
            //     })
            // )

            baseLayers = global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                    url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_YX}/geoserver/gwc/service/wmts`,

 src/views/home/components/leftContainer.vue

@@ -43,10 +43,11 @@
                <defs>
                    <path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                        d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z" fill="transparent" />
                                                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                        fill="transparent" />
                    <radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
                        <stop offset="0%" stop-color="#fff" stop-opacity="1" />
                        <stop offset="100%" stop-color="#fff" stop-opacity="0" />
@@ -55,10 +56,10 @@
                        <circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
                            <animateMotion dur="8s"
                                path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                            c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                            c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                            c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                            c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                            c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                            c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                            c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                            c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                rotate="auto" repeatCount="indefinite" />
                        </circle>
                    </mask>
@@ -763,13 +764,14 @@
                                msg = params.value + '人'
                            }

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

 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 21:04:10
 * @LastEditTime: 2023-03-09 17:13:53
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -377,6 +377,8 @@

        <el-dialog :title="dialogEquimentVideoTitle" :modal="true" :visible.sync="dialogEquimentVideoVisible"
            :before-close="dialogBeforeClose" :close-on-click-modal="true" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>
@@ -613,7 +615,9 @@

            destroyFlag: true,

            flvPlayer: null
            flvPlayer: null,

            videoPlayShow: false
        }
    },

@@ -1668,6 +1672,8 @@

        // 设备的视频播放
        async play (row) {
            this.videoPlayShow = true

            if (this.flvPlayer != null) {
                this.flvPlayer.pause()
                this.flvPlayer.unload()
@@ -1677,7 +1683,7 @@
            }

            this.dialogEquimentVideoTitle = row.name

            this.dialogEquimentVideoVisible = true

            let flvUrl = ''

@@ -1687,11 +1693,10 @@

            if (typeof flvUrl === 'object') {
                this.$message.error(flvUrl.msg)

                this.dialogEquimentVideoVisible = false
                return
            }

            this.dialogEquimentVideoVisible = true

            if (flvjs.isSupported()) {
                this.$nextTick(() => {
@@ -1704,6 +1709,7 @@
                    })
                    this.flvPlayer.attachMediaElement(videoElement)
                    this.flvPlayer.load()
                    this.videoPlayShow = false
                    this.flvPlayer.play()
                })
            }

 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-03-09 16:09:19
 * @LastEditTime: 2023-03-09 17:24:03
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -140,9 +140,9 @@
                                <div class="two">
                                    <div>
                                        <div>98</div>
                                                                                                                                                                                                                                <div>户籍人口</div>
                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                    <div>户籍人口</div>
                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                <div>
                                        <div style="color:#0E88FF">20</div>
                                        <div>流动人口</div>
                                    </div>
@@ -164,17 +164,17 @@
                                <div>
                                    <div>120</div>
                                    <div>出租</div>
                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                            <div>160</div>
                                                                                                                                                                                                                            <div>自住</div>
                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                            <div>8</div>
                                                                                                                                                                                                                            <div>空置</div>
                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                </div>-->
                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                <div>160</div>
                                                                                                                                                                                                                                                <div>自住</div>
                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                <div>8</div>
                                                                                                                                                                                                                                                <div>空置</div>
                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                    </div>-->
                        <div class="house-element-info" v-if="isShowHouseBox">
                        <!-- 选择单元 -->
                        <div class="condo" v-show="isShowUnitChoose">
@@ -219,17 +219,17 @@
                                    <div>
                                        <span class="zizhu"></span>
                                        自住
                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                    </div>-->
                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                <div>
                                                                                                                                                                                                                                                    <span class="kongzhi"></span>
                                                                                                                                                                                                                                                    空置
                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                <div>
                                                                                                                                                                                                                                                    <span class="shangye"></span>
                                                                                                                                                                                                                                                    商业
                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                        </div>-->
                            <el-main v-loading="pictLoading" element-loading-background="rgba(17, 38, 163, .1)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                v-show="isShowHouseBox">
@@ -266,8 +266,8 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                    <div class="focus"></div>
                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                                                                                                                                                                                                                                        <div class="focus"></div>
                                                                                                                                                                                                                                                            <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -637,8 +637,6 @@
            circleLayer = new global.DC.PrimitiveLayer('circleLayer')
            global.viewer.addLayer(circleLayer)

            console.log(this.$route.query)

            this.searchHouse = this.$route.query.searchName

            if (wallLayer == null) {
@@ -834,10 +832,10 @@
        // 楼栋单元楼层户室查询
        getHouses (build_id, adcode, aoiArr) {
            getHouses(build_id, adcode).then(res => {
                let maxHeight = res.data.data.ounnc
                let maxHeight = 3 * (res.data.data.properties.cjgga.features.length + 1)
                let houseData = res.data.data.properties

                curHousingName = res.data.data.ckgkt
                curHousingName = res.data.data.properties.ckgkt

                this.floorChoosed = []
                this.$EventBus.$emit('showHouse3D', { positions: houseData.kmj3a, minHeight: 0, maxHeight: maxHeight })

 src/views/police/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 22:28:51
 * @LastEditTime: 2023-03-09 17:13:32
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -128,6 +128,8 @@

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>
@@ -196,7 +198,9 @@
                currentPage: 1
            },

            currentSelectEquipment: {}
            currentSelectEquipment: {},

            videoPlayShow: false
        }
    },
    created () {
@@ -375,6 +379,8 @@
        },

        async play (row) {
            this.videoPlayShow = true

            if (this.flvPlayer != null) {
                this.flvPlayer.pause()
                this.flvPlayer.unload()
@@ -384,6 +390,8 @@
            }

            this.dialogTitle = row.name
            this.dialogVisible = true

            let flvUrl = ''

            await this.getDevices(row.channelId).then(res => {
@@ -392,11 +400,9 @@

            if (typeof flvUrl === 'object') {
                this.$message.error(flvUrl.msg)

                this.dialogVisible = false
                return
            }

            this.dialogVisible = true

            if (flvjs.isSupported()) {
                this.$nextTick(() => {
@@ -409,6 +415,7 @@
                    })
                    this.flvPlayer.attachMediaElement(videoElement)
                    this.flvPlayer.load()
                    this.videoPlayShow = false
                    this.flvPlayer.play()
                })
            }

			@@ -2,7 +2,7 @@
			* @Author: shuishen 1109946754@qq.com
			* @Date: 2022-08-18 17:00:30
			* @LastEditors: shuishen 1109946754@qq.com
			* @LastEditTime: 2023-03-09 10:50:09
			* @LastEditTime: 2023-03-10 09:23:24
			* @FilePath: \srs-police-affairs\src\components\map\index.vue
			* @Description: 公用地图组件
			*
			@@ -603,6 +603,13 @@
			// 天地图影像
			this.imgtype = 0
			baseLayers != null && global.viewer.imageryLayers.remove(baseLayers)

			// baseLayers = global.viewer.imageryLayers.addImageryProvider(
			// new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
			// url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_YX}/{z}/{x}/{y}.png`,
			// })
			// )

			baseLayers = global.viewer.imageryLayers.addImageryProvider(
			new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
			url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_YX}/geoserver/gwc/service/wmts`,

			@@ -43,10 +43,11 @@
			<defs>
			<path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
			d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
			c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
			c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
			c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
			c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z" fill="transparent" />
			c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
			c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
			c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
			c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
			fill="transparent" />
			<radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
			<stop offset="0%" stop-color="#fff" stop-opacity="1" />
			<stop offset="100%" stop-color="#fff" stop-opacity="0" />
			@@ -55,10 +56,10 @@
			<circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
			<animateMotion dur="8s"
			path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
			c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
			c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
			c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
			c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
			c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
			c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
			c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
			c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
			rotate="auto" repeatCount="indefinite" />
			</circle>
			</mask>
			@@ -763,13 +764,14 @@
			msg = params.value + '人'
			}

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

			@@ -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 21:04:10
			* @LastEditTime: 2023-03-09 17:13:53
			* @FilePath: \srs-police-affairs\src\views\home\index.vue
			* @Description: 小区-栋-层-房屋
			*
			@@ -377,6 +377,8 @@

			<el-dialog :title="dialogEquimentVideoTitle" :modal="true" :visible.sync="dialogEquimentVideoVisible"
			:before-close="dialogBeforeClose" :close-on-click-modal="true" class="car-video-box">
			<video-loading v-show="videoPlayShow"></video-loading>

			<video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
			style="object-fit: fill"></video>
			</el-dialog>
			@@ -613,7 +615,9 @@

			destroyFlag: true,

			flvPlayer: null
			flvPlayer: null,

			videoPlayShow: false
			}
			},

			@@ -1668,6 +1672,8 @@

			// 设备的视频播放
			async play (row) {
			this.videoPlayShow = true

			if (this.flvPlayer != null) {
			this.flvPlayer.pause()
			this.flvPlayer.unload()
			@@ -1677,7 +1683,7 @@
			}

			this.dialogEquimentVideoTitle = row.name

			this.dialogEquimentVideoVisible = true

			let flvUrl = ''

			@@ -1687,11 +1693,10 @@

			if (typeof flvUrl === 'object') {
			this.$message.error(flvUrl.msg)

			this.dialogEquimentVideoVisible = false
			return
			}

			this.dialogEquimentVideoVisible = true

			if (flvjs.isSupported()) {
			this.$nextTick(() => {
			@@ -1704,6 +1709,7 @@
			})
			this.flvPlayer.attachMediaElement(videoElement)
			this.flvPlayer.load()
			this.videoPlayShow = false
			this.flvPlayer.play()
			})
			}