关闭按钮和echarts图例调整

shuishen

2023-04-18 4babef2228379742188ad51d77300efcbd00a1ba

关闭按钮和echarts图例调整

 public/img/icon/close.png

 src/api/dept/index.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-11-30 15:18:29
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-17 17:11:15
 * @LastEditTime: 2023-04-18 17:50:56
 * @FilePath: \srs-police-affairs\src\api\dept\index.js
 * @Description:
 *
@@ -66,8 +66,8 @@
export const getAoiByPt = (lng, lat, height, adcode, tolerance) => {
    return request({
        // url: '/sf3d/area/getAoiByPt',
        // url: '/sf3d/area/stdgetAoiByPt',
        url: '/data/getAoiByBgId.json',
        url: '/sf3d/area/stdgetAoiByPt',
        // url: '/data/getAoiByBgId.json',
        method: 'get',
        authorization: false,
        requestBaseUrl: 'fengt',

 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-18 14:55:01
 * @LastEditTime: 2023-04-18 18:11:01
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -44,6 +44,7 @@
                    <div class="title">
                        底图
                        <div class="close" @click.stop="showImgBtn = false">
                            <img src="/img/icon/close.png" alt="">
                        </div>
                    </div>

@@ -295,12 +296,12 @@
            that.switchImg()

            // 地形数据添加
            this.addTerrain()
            
            that.addTerrain()

            // 外网
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=d083e4cf30bfc438ef93436c10c2c20a',
            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
            //         format: 'image/jpeg',
            //         show: true,
@@ -551,7 +552,6 @@
                }

            document.querySelector('.dc-zoom-controller .refresh svg title').innerHTML = '初始化位置'

        })
    },

@@ -758,6 +758,7 @@

        addTerrain () {
            projectTerrain = global.DC.TerrainFactory.createUrlTerrain({
                // url: `http://data.marsgis.cn/terrain`
                url: `${window.BASE_URL_CONFIG.VUE_APP_MAP_DX}`
            })

@@ -1151,6 +1152,8 @@
                shadows: global.DC.Namespace.Cesium.ShadowMode.DISABLED
            })

            tilesetObject[titlesetName].setHeight(10)

            tilesetLayer.addOverlay(tilesetObject[titlesetName])

            // global.viewer.flyTo(tilesetObject[titlesetName])removeMxTileset
@@ -1220,8 +1223,8 @@
                        polygonHierarchy: new global.DC.Namespace.Cesium.PolygonHierarchy(
                            global.DC.Namespace.Cesium.Cartesian3.fromDegreesArray(floorPositions),
                        ),
                        extrudedHeight: 80,//分层顶部海拔
                        height: 50,//分层底部海拔
                        extrudedHeight: maxHeight + 10,//分层顶部海拔
                        height: minHeight + 10,//分层底部海拔
                    }),

                    attributes: {

 src/styles/dc/index.scss

@@ -180,25 +180,6 @@
        display: flex;
        flex-direction: column;

        .title {
            .close {
                position: absolute;
                right: 5px;
                top: 0;
            }

            .close::before {
                font-family: element-icons;
                content: '\e6db';
                cursor: pointer;
                font-size: 16px;
            }

            .close:hover::before {
                color: #3d95f3;
            }
        }

        .content {
            display: flex;
        }

 src/styles/media/index.scss

@@ -2475,8 +2475,32 @@
                            height: countSizeVh(32);
                            line-height: countSizeVh(32);
                            text-align: left;

                            .close {
                                position: absolute;
                                right: 5px;
                                top: 0;
                                overflow: hidden;

                                img {
                                    width: countSizeVh(16);
                                    height: countSizeVh(16);
                                    cursor: pointer;
                                }

                            }

                            .close:hover {

                                img {
                                    transform: translate(countSizeVh(100), 0);
                                    filter: drop-shadow(countSizeVh(-100) 0px #3d95f3);
                                }

                            }
                        }


                        .content {
                            padding: 0 countSizeVw(8, 1920);
                            height: countSizeVh(66);

 src/views/home/components/rightContainer.vue

@@ -488,6 +488,7 @@
                }
            } else {
                option = {
                    color: ['#5470C6', '#73C0DE', '#EE6666', '#FAC858'],
                    tooltip: {
                        trigger: "item",
                        formatter:
@@ -507,7 +508,10 @@
                        },
                    },
                    legend: {
                        data: ['盗窃', '诈骗', '纠纷', '其他']
                        data: ['盗窃', '诈骗', '纠纷', '其他'],
                        textStyle: {
                            color: "#fff"
                        }
                    },
                    yAxis: {
                        type: "value",

 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-04-09 15:48:43
 * @LastEditTime: 2023-04-18 17:49:23
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -196,7 +196,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>
@@ -989,6 +989,8 @@
                    res.data.data.properties.hwtxa.features[0].properties.mbfdr -
                    res.data.data.properties.hwtxa.features[0].properties.yjpca

                console.log(res.data.data.properties.hwtxa.features[0].properties.yjpca, res.data.data.properties.hwtxa.features[0].properties.mbfdr, 95622)

                let houseData = res.data.data.properties

                curHousingName = res.data.data.properties.ckgkt
@@ -1106,9 +1108,9 @@

            this.$EventBus.$emit("toPosition", {
                siteJd: Number(homeCenter[0]) + 0.00006,
                siteWd: Number(homeCenter[1]) - 0.00030,
                siteGd: params.properties.szhfr + 240,
                sitePitch: -80,
                siteWd: Number(homeCenter[1]) - 0.0013,
                siteGd: params.properties.szhfr + curHousingHWTXA.features[0].properties.yjpca + 240,
                sitePitch: -60,
            })

            this.floorChoosed = params.properties.fojcu
@@ -1121,8 +1123,8 @@
            this.residentLoading = true
            this.$EventBus.$emit("showThreeDimensions", {
                positions: params.properties.kmj3a,
                minHeight: params.properties.szhfr + curHousingHWTXA.yjpca,
                maxHeight: params.properties.szhfr + params.properties.hnagn + curHousingHWTXA.yjpca,
                minHeight: params.properties.szhfr + curHousingHWTXA.features[0].properties.yjpca,
                maxHeight: params.properties.szhfr + params.properties.hnagn + curHousingHWTXA.features[0].properties.yjpca,
            })
        },

@@ -1141,9 +1143,9 @@
                    ...item,
                    siteJd: Number(item.siteJd),
                    siteWd: Number(item.siteWd) - 0.0021,
                    siteGd: 240,
                    siteGd: 600,
                    // siteGd: 1500,
                    sitePitch: -45,
                    sitePitch: -60,
                })
            }
            this.buildingChoosed = item
@@ -1638,7 +1640,7 @@
            getResidentialQuartersInfo(area_id, adcode).then((res) => {
                let positionStr = ""
                res.data.data.geometry.coordinates[0].forEach((item) => {
                    positionStr += item[0] + "," + item[1] + "," + "10;"
                    positionStr += item[0] + "," + item[1] + "," + "100;"
                })

                if (wallLayer != null) {