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

guanqb

2023-02-06 afdc9216eb583e0aa6a81e6a4480009713fc3367

Merge branch 'master' of http://192.168.0.105:10010/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-02-04 16:19:58
 * @LastEditTime: 2023-02-06 17:25:33
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -215,6 +215,19 @@
            //     })
            // )

            // 影像图层
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
            //         url: "http://10.141.11.12:18088/geoserver/gwc/service/wmts?STORETYPE=merged-dat&PROJECTION=4326",
            //         layer: "test",
            //         style: "default",
            //         format: "image/png",
            //         tileMatrixSetID: "c",
            //         tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
            //         tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
            //     })
            // )

            // 设置地图初始位置，角度等
            global.viewer.camera.setView({
                // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
@@ -319,6 +332,11 @@
            // 比例尺
            // global.viewer.distanceLegend.enable = true

            // let arr1 = [[117.9552436, 28.44500025], [117.9557116, 28.44429919], [117.9574856, 28.44444285]]

            // arr1.forEach(item => {
            //     console.log(global.DC.CoordTransform.GCJ02ToWGS84(item[0], item[1]), 2222)
            // })
        }

        global.DC.ready(initViewer)

 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-04 11:15:30
 * @LastEditTime: 2023-02-06 17:17:53
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -771,9 +771,6 @@
    },

    created () {



        // 首页跳转社区包含参数
        if (this.$route.query.id) {
            this.getVillageInfo(this.$route.query.id)
@@ -879,28 +876,40 @@
         * @return {*}
         */
        async loadNode (node, resolve) {
            if (node.level === 0) {
                let policeStaionList = []
                await getPoliceStationLazyTree(1).then(res => {
                    policeStaionList = res.data.data
                })
                return resolve(policeStaionList)
            }
            if (node.level == 1) {
                let areaList = []
                await getPoliceStationLazyTree(2, node.data.id).then(res => {
                    areaList = res.data.data
                })
                return resolve(areaList)
            }
            if (node.level == 2) {
                let villageList = []
                await getPoliceStationLazyTree(3, node.data.id).then(res => {
                    res.data.data.forEach(item => {
                        villageList = res.data.data
            if (this.userInfo.dept_id != '1123598813738675201') {
                let list = []
                let type = node.level + 1
                await getPoliceStationLazyTree(type, node.level === 0 ? this.userInfo.dept_id : node.data.id).then(res => {
                    if (res.data.data instanceof Array) {
                        list = res.data.data
                    }

                    if (Object.getPrototypeOf(res.data.data) === Object.prototype) {
                        list.push(res.data.data)
                    }

                    list.forEach(item => {
                        item.leaf = !item.hasChildren
                    })
                })
                return resolve(villageList)
                return resolve(list)
            } else {
                let list = []
                let type = node.level + 1
                await getPoliceStationLazyTree(type, node.level === 0 ? '' : node.data.id).then(res => {
                    if (res.data.data instanceof Array) {
                        list = res.data.data
                    }

                    if (Object.getPrototypeOf(res.data.data) === Object.prototype) {
                        list.push(res.data.data)
                    }

                    list.forEach(item => {
                        item.leaf = !item.hasChildren
                    })
                })
                return resolve(list)
            }
        },