dedsudiyu месяцев назад: 10
Родитель
Сommit
4ca33118d4
1 измененных файлов с 16 добавлено и 5 удалено
  1. 16 5
      pages_manage/views/emergencyEvacuationBig.vue

+ 16 - 5
pages_manage/views/emergencyEvacuationBig.vue

@@ -70,7 +70,7 @@
 									item.policeType && subId !=item.subId ? 'room-type-two':(
 									item.policeType && subId ==item.subId ? 'room-type-three':(
 									!item.loginAdmin ? 'room-type-noe':'')))"
-									:style="'top:'+item.y+'rpx;left:'+item.x+'rpx;width:'+(item.w-4)+'rpx;height:'+(item.h-4)+'rpx;'">
+									:style="'top:'+item.y+'rpx;left:'+item.x+'rpx;width:'+(item.w-4)+'rpx;height:'+(item.h-4)+'rpx;background:'+item.levelColor+';'">
 									<view class="map-max-for-min-box">
 										<view class="map-for-name-p" :style="'margin-top:'+((item.h/2)-20)+'rpx;'">
 											{{item.roomType == '-99'?item.roomName:item.subName}}
@@ -456,7 +456,7 @@
 						for (let o = 0; o < self.buildingList.length; o++) {
 							for (let i = 0; i < data.data.length; i++) {
 								if (data.data[i].buildId == self.buildingList[o].id) {
-									self.buildingList[o].name.replace('(预案发生)')
+									self.buildingList[o].name = self.textFiltration(self.buildingList[o].name)
 									self.buildingList[o].name = '(预案发生) ' + self.buildingList[o].name
 								}
 							}
@@ -467,7 +467,7 @@
 						for (let o = 0; o < self.floorList.length; o++) {
 							for (let i = 0; i < data.data.length; i++) {
 								if (data.data[i].floorId == self.floorList[o].id) {
-									self.floorList[o].name.replace('(预案发生)')
+									self.floorList[o].name = self.textFiltration(self.floorList[o].name)
 									self.floorList[o].name = '(预案发生) ' + self.floorList[o].name
 								}
 							}
@@ -483,12 +483,12 @@
 									num++
 									bigNum++
 									self.$set(this, 'groupId', data.data[i].eventId)
-									self.fjListArray[o].subName.replace('(预案发生)')
+									self.fjListArray[o].subName = self.textFiltration(self.fjListArray[o].subName)
 									self.fjListArray[o].subName = '(预案发生) ' + self.fjListArray[o].subName
 								}
 							}
 							if (num == 0) {
-								self.fjListArray[o].subName.replace('(预案发生)')
+								self.fjListArray[o].subName = self.textFiltration(self.fjListArray[o].subName)
 							}
 						}
 						if (bigNum != 0) {
@@ -862,6 +862,16 @@
 				} = await laboratoryBigViewGetFloorByBigView({
 					id: this.floorId
 				})
+				const hex2Rgba = (bgColor) => {
+					let color = bgColor.slice(1); // 去掉'#'号
+					let rgba = [
+						parseInt("0x" + color.slice(0, 2)),
+						parseInt("0x" + color.slice(2, 4)),
+						parseInt("0x" + color.slice(4, 6)),
+						0.6
+					];
+					return "rgba(" + rgba.toString() + ")";
+				};
 				console.log('data', data)
 				if (data.code == 200) {
 					if (data.data[0].buildLayoutVoList[0]) {
@@ -886,6 +896,7 @@
 										list[i].subId = data.data[0].buildLayoutVoList[o].subId;
 										list[i].online = data.data[0].buildLayoutVoList[o].online;
 										list[i].loginAdmin = data.data[0].buildLayoutVoList[o].loginAdmin;
+										list[i].levelColor = data.data[0].buildLayoutVoList[o].levelColor?hex2Rgba(data.data[0].buildLayoutVoList[o].levelColor):'';
 										list[i].policeType = false;
 									}
 								}