Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-04-10 4c6a9530e19504a3e012315648b4438e4bfae61e

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 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-04-10 16:42:50
 * @LastEditTime: 2023-04-10 17:35:32
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -20,12 +20,12 @@
        <!-- 全屏控制按钮 -->
        <div class="screen-full-btn">
            <!-- <el-tooltip v-if="isFullscreen" content="缩放" placement="top" effect="dark">
                                                                                                    <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                                                                                                </el-tooltip> -->
                                                                                                        <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                                                                                                    </el-tooltip> -->

            <!-- <el-tooltip v-if="!isFullscreen" content="全屏" placement="top" effect="dark">
                                                                                                        <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                                                                                                    </el-tooltip> -->
                                                                                                            <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                                                                                                        </el-tooltip> -->
            <el-tooltip content="显示/隐藏" placement="top" effect="dark">
                <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="switchShowHomeContent"></i>
            </el-tooltip>

 src/views/home/index.vue

@@ -310,9 +310,7 @@
let circleLayer = null
let DataSourcesArray = []
let loading = null

import { mapGetters } from 'vuex'

let xinzhouLayer = null

let treeData = [
    {
@@ -435,6 +433,8 @@
import keyPersonBox from './components/dialog/keyPersonBox.vue'

import { initMapPosition } from '@/utils/mapPositionInit'
import { mapGetters } from 'vuex'
import { xinzhou } from './xinzhou.js'

export default {
    inject: ['userInfo'],
@@ -626,6 +626,23 @@
                    }
                })
            }
            // 绘制信州边界线
            let xinzhouRange = xinzhou.reduce(
                (previous, current) => {
                    previous += current[0] + ',' + current[1] + ';'
                    return previous
                },
                []
            )
            xinzhouLayer = new global.DC.VectorLayer('xinzhouLayer')
            global.viewer.addLayer(xinzhouLayer)
            let xinzhouPolyline = new global.DC.Polyline(xinzhouRange)
            xinzhouPolyline.setStyle({
                width: 20,
                material: global.DC.Namespace.Cesium.Color.fromBytes(255, 202, 143, 255),
                clampToGround: true
            })
            xinzhouLayer.addOverlay(xinzhouPolyline)
        })

        const that = this
@@ -634,6 +651,7 @@
        })

        window.addEventListener('resize', this.setDomStyle)

    },

    methods: {
@@ -973,7 +991,7 @@
                    layerName: 'polygonLayer',
                    flag: true
                })

                xinzhouLayer.show = true
            } else {
                DataSourcesArray.forEach(i => i.show = false)

@@ -986,6 +1004,7 @@
                    layerName: 'polygonLayer',
                    flag: false
                })
                xinzhouLayer.show = false

            }
        },
@@ -2010,7 +2029,10 @@
            cylinderLayer.remove()
            cylinderLayer = null
        }

        if (xinzhouLayer != null) {
            xinzhouLayer.remove()
            xinzhouLayer = null
        }

        circleLayer.remove()
        circleLayer = null

 src/views/home/xinzhou.js

New file
Diff too large

 src/views/house/index.vue

@@ -189,7 +189,7 @@
                                                :class="{ on: floorChoosed == value.properties.fojcu }">
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                        <div class="warning"></div>-->
                                                                                                                        <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -651,15 +651,20 @@
    methods: {
        // 获取半年前时间
        getHalfYearTime () {
            const cc = new Date().getTime()
            const nowResult = new Date().getTime()
            let halfYear = 365 / 2 * 24 * 3600 * 1000
            let pastResult = cc - halfYear
            let pastResult = nowResult - halfYear
            let pastDate = new Date(pastResult),
                pastYear = pastDate.getFullYear(),
                pastMonth = pastDate.getMonth() + 1,
                pastDay = pastDate.getDate()
            let nowDate = new Date(nowResult),
                nowYear = nowDate.getFullYear(),
                nowMonth = nowDate.getMonth() + 1,
                nowDay = nowDate.getDate()
            let halfYearTime = pastYear + '-' + pastMonth + '-' + pastDay
            return halfYearTime
            let nowTime = nowYear + '-' + nowMonth + '-' + nowDay
            return [halfYearTime, nowTime]
        },

        showHouseingTileset (params) {
@@ -1332,7 +1337,8 @@
                size: this.callPolicePage.pagesize,
                sfdz: this.villageInfo.name,
                jjdwbh: this.userInfo.dept_id,
                time: this.getHalfYearTime()
                start: this.getHalfYearTime()[0],
                end: this.getHalfYearTime()[1]
            }).then((res) => {
                this.callPolicePage.count = res.data.data.pages