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

shuishen

2023-02-16 0c591f06367687134ae80829f3e833725c1cadfe

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

 src/views/house/index.vue

@@ -693,7 +693,7 @@
            treeEmptyText: "",

            contentShow: true,
            unitOptions: [{ value: 1, label: '1单元' }],
            unitOptions: [],
            unitValue: 1,
            searchHouse: '',
            navType: 0,
@@ -770,6 +770,7 @@
            isShowHouseBox: true,
            floorChoosed: {},
            isShowUnitChoose: false,
            allHouseFloorList: [],
        }
    },

@@ -1025,29 +1026,44 @@
                this.$EventBus.$emit('showHouse3D', { positions: houseData.kmj3a, minHeight: 0, maxHeight: maxHeight })

                if (res.data != null && houseData.nwwqd.features != []) {
                    // let unitData = res.data.data.unit[this.unitValue - 1].house
                    let unitData = houseData.nwwqd.features
                    this.floorInfo.house_num = unitData.length
                    if (houseData.hwtxa.features.length > 1) {
                        this.isShowUnitChoose = true
                    this.isShowUnitChoose = true
                    }
                    let houseFloorList = []
                    unitData.forEach(item => {
                        if (houseFloorList.indexOf(Number(item.properties.cftlg)) === -1) {
                            houseFloorList.push(Number(item.properties.cftlg))
                        }
                    })
                    houseFloorList = houseFloorList.sort((a, b) => {
                        return a - b
                    })
                    let newArr = []
                    houseFloorList.forEach(floor => {
                        let houseArr = unitData.filter(item => {
                            return Number(item.properties.cftlg) == floor
                    let allUnitDate = []
                    houseData.hwtxa.features.forEach((item, index) => {
                        this.unitOptions.push({ value: `${index + 2}`, label: `${item.properties.pgjmz}` })
                        let unitOptionData = []
                        unitData.forEach(inItem => {
                            if (inItem.properties.pgjmz == item.properties.pgjmz) {
                                unitOptionData.push(inItem)
                            }
                        })
                        newArr.push({ floor_num: floor, floor_house: houseArr.slice(0, 4) })
                        allUnitDate.push(unitOptionData)
                    })
                    this.unitHouseChoosed = newArr
                    this.allHouseFloorList = []
                    allUnitDate.forEach(item => {
                        let houseFloorList = []
                        item.forEach(inItem => {
                            if (houseFloorList.indexOf(Number(inItem.properties.cftlg)) === -1) {
                                houseFloorList.push(Number(inItem.properties.cftlg))
                            }
                        })
                        houseFloorList = houseFloorList.sort((a, b) => {
                            return a - b
                        })
                        let newArr = []
                        houseFloorList.forEach(floor => {
                            let houseArr = item.filter(inItem => {
                                return Number(inItem.properties.cftlg) == floor
                            })
                            newArr.push({ floor_num: floor, floor_house: houseArr.slice(0, 4) })
                        })
                        this.allHouseFloorList.push(newArr)
                    })
                    this.unitHouseChoosed = this.allHouseFloorList[0]
                    console.log(this.unitHouseChoosed, 2222)
                    if (aoiArr) {
                        this.unitHouseChoosed.forEach((item, index) => {
                            let aoiHeight = aoiArr[1]
@@ -1160,6 +1176,7 @@

        chooseUnit (value) {
            this.floorsType = 1
            this.unitHouseChoosed = this.allHouseFloorList[this.unitValue - 1]
            document.querySelector(".floor-num").style.left = '0px'
            this.lastFloorShow = false
        },

 src/views/video/list.vue

@@ -192,7 +192,7 @@
            :close-on-click-modal="true"
            class="video-draw-box"
        >
            <input type="text" v-model="drawName" placeholder="请输入绘制线或面的名称" />
            <input type="text" v-model="drawName" placeholder="请输入绘制线的名称" />
            <button @click="saveDrawInfo">保存</button>
        </el-dialog>
    </div>