解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 admin/src/views/roomStatus/index.vue

@@ -288,7 +288,7 @@
                                            </div>
                                        </div>
                                        <div class="xm_house_list_right">
                                            <template v-for="(child, i) in item.roomsList" :key="i">
                                            <template v-for="(child, i) in item.roomsList" >
                                                <div class="xm_house_list_right_row" v-for="(childThree, a) in child" :key="a" :style="{ width: childThree.width + 'px', backgroundColor: ifBackground(childThree.roomStatus) }">
                                                    <div class="ft">
                                                        <span>{{childThree.roomCode}}</span>
@@ -305,7 +305,6 @@
                                                    <div class="xm_house_list_right_row_day" v-if="childThree.roomStatus === 0">未出租｜空置{{childThree.freeDayAmount}}天</div>
                                                </div>
                                            </template>
                                            
                                        </div>
                                    </div>
                                </div>
@@ -498,7 +497,7 @@
                                        <el-table
                                            :data="tableData"
                                            border
                                            v-lading="loading"
                                            v-loading="loading"
                                            style="width: 100%">
                                            <el-table-column
                                                prop="categoryName"
@@ -687,6 +686,7 @@
          label: '黄金糕'
        }],
        value: '',
        ids:[],
        form: {
          name: '',
          status: '',
@@ -1246,7 +1246,7 @@
        .box_content {
            width: 100%;
            display: flex;
            align-items: start;
            align-items: flex-start;
            justify-content: space-between;
            .left {
                width: 300px;