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

guanqb

2023-04-27 297f144c3970ca3fa0f65abe5b1fa2533f6e8253

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

 src/styles/base/index.scss

@@ -156,7 +156,7 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 450px;
        width: 720px;

        .el-dialog__body {
            flex: 1;

 src/styles/media/index.scss

@@ -372,7 +372,7 @@

                        .region-select {
                            top: countSizeVh(80);
                            width: countSizeVw(640, 1920);
                            width: countSizeVw(720, 1920);
                            height: countSizeVh(36);

                            .selects-container .selects-box .text {
@@ -1987,7 +1987,7 @@

                    .resident-details-box {
                        .el-dialog {
                            width: countSizeVw(750, 1920);
                            width: countSizeVw(720, 1920);
                        }

                        .el-dialog__header span {

 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-04-25 16:30:36
 * @LastEditTime: 2023-04-27 13:09:59
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -2246,7 +2246,7 @@
        display: flex;
        position: absolute;
        top: 80px;
        width: 640px;
        width: 720px;
        height: 36px;
        z-index: 99;


 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-22 09:15:54
 * @LastEditTime: 2023-04-27 14:03:22
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -603,9 +603,10 @@
        if (this.$route.query.id) {
            this.getVillageInfo(this.$route.query.id)
            // 使用首页传过来的小区id获取停车场出入口商场和 小区名称类型地址数据
            // 原来 361100  临时361102
            this.getSearchExtensivelyBgAoiDeepdata(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
                "361102",
                this.$route.query.id,
                "1|3"
            )
@@ -627,7 +628,7 @@
                // 大搜之搜索面详细数据（停车场出入口商场）--默认万达华府
                this.getSearchExtensivelyBgAoiDeepdata(
                    "ebf48ecaa1fd436fa3d40c4600aa051f",
                    "361100",
                    "361102",
                    villageId,
                    "1|3"
                )
@@ -821,7 +822,7 @@
         */
        currentChangeHandle (current, currentNode) {
            if (current.hasChildren == true || current.type != 3) return

            this.$EventBus.$emit("clearHouse3D")
            this.filterText = ""
            this.prop = current.name
            if (current.type == 3) {
@@ -840,7 +841,7 @@

            this.getSearchExtensivelyBgAoiDeepdata(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
                "361102",
                current.id,
                "1|3"
            )
@@ -956,6 +957,9 @@
                                siteGd: 360,
                                // build_id: `${item.std_addr_id.split("|")[1]}`,
                                build_id: `${item.uid}`,

                                // 临时新加 business_id 用来请求3D
                                business_id: `${item.business_id}`,
                                floor_num: `${item.floor_num}`,
                                elev: `${item.elev}`,
                            })
@@ -1203,10 +1207,10 @@
            // 楼栋单元楼层户室查询-大搜
            this.getUnitHousesData(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
                "361102",
                item.build_id,
                "1|3")
            this.getHouses3DData(item.build_id, "361100", aoiArr)
            this.getHouses3DData(item.business_id, "361102", aoiArr)
            this.floorsType = 1
            document.querySelector(".floor-num").style.left = "0px"
            this.lastFloorShow = false
@@ -1720,7 +1724,7 @@
                let bgId = res.data.data.properties.ijnnl
                getSearchExtensively(
                    "ebf48ecaa1fd436fa3d40c4600aa051f",
                    "361100",
                    "361102",
                    "",
                    bgId
                ).then(async (res) => {

 vue.config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-25 16:23:53
 * @LastEditTime: 2023-04-27 12:29:35
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -166,9 +166,9 @@
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                // target: "http://localhost:82",
                // target: "http://106.225.193.35:82",
                target: "http://106.225.193.35:82",
                // target: "http://192.168.0.100:82",
                target: "http://172.16.13.150:82",
                // target: "http://172.16.13.150:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566
                changeOrigin: true, //开启代理跨域