dedsudiyu před 2 roky
rodič
revize
1b9bfc1db6
1 změnil soubory, kde provedl 19 přidání a 18 odebrání
  1. 19 18
      src/views/classifyGradeDetail.vue

+ 19 - 18
src/views/classifyGradeDetail.vue

@@ -70,10 +70,11 @@
                                      :style="'width:'+mapData.minWidth+'px;height:'+mapData.minHeight+'px;transform: scale('+mapData.minZoomData+');margin-top:-'+mapData.minHeight/2+'px;margin-left:-'+mapData.minWidth/2+'px;'">
                                      :style="'width:'+mapData.minWidth+'px;height:'+mapData.minHeight+'px;transform: scale('+mapData.minZoomData+');margin-top:-'+mapData.minHeight/2+'px;margin-left:-'+mapData.minWidth/2+'px;'">
                                     <div class="evacuation-shade-map-box"
                                     <div class="evacuation-shade-map-box"
                                          :style="'width:'+mapData.minWidth+'px;height:'+mapData.minHeight+'px;'">
                                          :style="'width:'+mapData.minWidth+'px;height:'+mapData.minHeight+'px;'">
-                                        <div class="evacuation-shade-map-for-box for-map-box-one"
-                                             v-for="(item,index) in mapData.mapList" :key="item.key" v-if="item.type == 1"
+                                        <div class="evacuation-shade-map-for-box "
+                                             :class="item.type==1?'for-map-box-one':(item.type==2?'for-map-box':(item.type==3?'for-map-box-two':''))"
+                                             v-for="(item,index) in mapData.mapList" :key="item.key" v-if="item.type == 1 || item.type == 2 || item.type == 3"
                                              :style="'background:'+item.classifiedColor+';top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
                                              :style="'background:'+item.classifiedColor+';top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
-                                            <div class="evacuation-shade-map-min-box">
+                                            <div class="evacuation-shade-map-min-box" v-if="item.type == 1">
                                                 <!--名称/实验室名称-->
                                                 <!--名称/实验室名称-->
                                                 <p class="map-for-name-p" :style="'margin-top:'+((item.h/2)-25)+'px;'">
                                                 <p class="map-for-name-p" :style="'margin-top:'+((item.h/2)-25)+'px;'">
                                                     {{item.roomType == '-99'?item.roomName:item.subName}}</p>
                                                     {{item.roomType == '-99'?item.roomName:item.subName}}</p>
@@ -81,18 +82,18 @@
                                                 <p class="map-for-num-p">{{item.roomNum}}</p>
                                                 <p class="map-for-num-p">{{item.roomNum}}</p>
                                             </div>
                                             </div>
                                         </div>
                                         </div>
-                                        <div class="evacuation-shade-map-for-box for-map-box"
-                                             v-for="(item,indexOne) in newMapData.mapList" :key="item.key" v-if="item.type == 2"
-                                             :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
-                                            <div class="evacuation-shade-map-min-box"></div>
-                                        </div>
-                                        <div class="evacuation-shade-map-for-box for-map-box-two"
-                                             v-for="(item,indexTwo) in newMapData.mapList" :key="item.key" v-if="item.type == 3"
-                                             @click="shadeCheckRoomClick(item)"
-                                             :class="item.roomCheckType?'for-map-box-two-check':''"
-                                             :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
-                                            <div class="evacuation-shade-map-min-box"></div>
-                                        </div>
+                                        <!--<div class="evacuation-shade-map-for-box for-map-box"-->
+                                             <!--v-for="(item,indexOne) in newMapData.mapList" :key="item.key" v-if="item.type == 2"-->
+                                             <!--:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">-->
+                                            <!--<div class="evacuation-shade-map-min-box"></div>-->
+                                        <!--</div>-->
+                                        <!--<div class="evacuation-shade-map-for-box for-map-box-two"-->
+                                             <!--v-for="(item,indexTwo) in newMapData.mapList" :key="item.key" v-if="item.type == 3"-->
+                                             <!--@click="shadeCheckRoomClick(item)"-->
+                                             <!--:class="item.roomCheckType?'for-map-box-two-check':''"-->
+                                             <!--:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">-->
+                                            <!--<div class="evacuation-shade-map-min-box"></div>-->
+                                        <!--</div>-->
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                             </div>
                             </div>
@@ -604,8 +605,8 @@
                             width:rw(300);
                             width:rw(300);
                             height:rh(200);
                             height:rh(200);
                             .center-bottom-for-min-box{
                             .center-bottom-for-min-box{
-                                width:rw(300);
-                                height:rh(160);
+                                width:rw(302);
+                                height:rh(162);
                                 border:rh(1) solid #666;
                                 border:rh(1) solid #666;
                                 position: relative;
                                 position: relative;
                                 .evacuation-shade-map-big-box {
                                 .evacuation-shade-map-big-box {
@@ -683,7 +684,7 @@
                                         }
                                         }
                                         .for-map-box-two {
                                         .for-map-box-two {
                                             /*background: url("../assets/image/icon_jjck.png") center center no-repeat rgba(24, 137, 60, 1);*/
                                             /*background: url("../assets/image/icon_jjck.png") center center no-repeat rgba(24, 137, 60, 1);*/
-                                            background: url("../assets/image/icon_jjck.png") center center no-repeat rgba(24, 137, 60, 0);
+                                            background: url("../assets/image/icon_jjck.png") center center no-repeat rgba(6,35,56,0)!important;
                                             background-size: 80px 80px;
                                             background-size: 80px 80px;
                                         }
                                         }
                                         .for-map-box-two-check {
                                         .for-map-box-two-check {