Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

bfwms

2025-03-29 afdf7d86cffe39c24b55936321bd3b3133adaf40

 src/main/webapp/views/home/map.html

@@ -413,13 +413,13 @@

                        <!--库位-->
                        <div v-else-if="map[index][idx].value  == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
                            <div v-if="map[index][idx].locSts == 'O'" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
                            <div v-if="map[index][idx].locSts == 'O'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'D'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
                            <div v-else-if="map[index][idx].locSts == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
                            <div v-else class="pointBox pointBoxDefault">{{ map[index][idx].locSts }}</div>
                            <div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
                        </div>

                        <!--堆垛机-->
@@ -1061,19 +1061,16 @@

                                })
                            })
                            data.forEach((item,index) => {
                                let locNo = item.locNo
                                let y = parseInt(locNo.substr(2,3))
                                let x = parseInt(locNo.substr(0,2))
                                if (x >= 4 && x <= 11) {
                                    x++;
                                }else if (x >= 12 && x <= 18) {
                                    x += 2;
                                } else if (x >= 19 && x <= 21) {
                                    x += 3;
                                }

                                tmp[x][y].searchStatus = true//搜索标记
                            data.forEach((item,i) => {
                                let locNo = item.locNo
                                tmp.forEach((item,index) => {
                                    item.forEach((val,idx) => {
                                        if (tmp[index][idx].locNo == locNo) {
                                            tmp[index][idx].searchStatus = true//搜索标记
                                        }
                                    })
                                })
                            })
                            that.map = tmp
                            $layui.layer.msg("搜索成功");