dedsudiyu 1 year ago
parent
commit
4c7626bf1b

+ 9 - 0
api/index.js

@@ -2310,3 +2310,12 @@ export const buildBySubList  = (data) => {
         data: data
     })
 };
+
+//查看气瓶数据
+export const airbottleStockFindClassifyBySubId  = (data) => {
+    return apiResquestForm({
+        url: `/airbottle/stock/findClassifyBySubId`,
+        method: 'GET',
+        data: data
+    })
+};

BIN
images/evacuation3_2/gasBottleAlarm.png


BIN
images/evacuation3_2/gasBottleAlarm_a.png


+ 15 - 12
pages/manageWorkbench.vue

@@ -41,7 +41,7 @@
     <view class=big-icon-button-box>
 		<!-- 气瓶管理 -->
 		<view class="big-icon-button-box_l">
-			<img  class="big-icon-button-box_bg" src="@/images/img_bg_qpgl.png" @click="goPage('gasManage')">
+			<!-- <img  class="big-icon-button-box_bg" src="@/images/img_bg_qpgl.png" @click="goPage('gasManage')"> -->
 			<view class="big-icon-button-box_t1">气瓶管理</view>
 			<view class="big-icon-button-box_t2">安全第一   预防为主</view>
 		</view>
@@ -588,13 +588,14 @@ export default {
 	justify-content: space-between;
     margin:20rpx;
 	.big-icon-button-box_l{
-		position: relative;
+		background: url("../images/img_bg_qpgl.png") no-repeat;
+		background-size: 372rpx 260rpx;
 		width:372rpx;
 		height:260rpx;
-		.big-icon-button-box_bg{
-			width:372rpx;
-			height:260rpx;
-		}
+		// .big-icon-button-box_bg{
+		// 	width:372rpx;
+		// 	height:260rpx;
+		// }
 		.big-icon-button-box_t1{
 			width: 149rpx;
 			height: 40rpx;
@@ -606,9 +607,10 @@ export default {
 			color: #333333;
 			line-height: 40rpx;
 			text-align: center;
-			position:absolute;
-			right: 42rpx;
-			top: 94rpx;
+			margin:94rpx 0 0 181rpx;
+			// position:absolute;
+			// right: 42rpx;
+			// top: 94rpx;
 			
 		}
 		.big-icon-button-box_t2{
@@ -619,9 +621,10 @@ export default {
 			font-weight: 400;
 			color: #333333;
 			line-height: 20rpx;
-			position:absolute;
-			right: 28rpx;
-			top: 148rpx;
+			margin:20rpx 0 0 181rpx;
+			// position:absolute;
+			// right: 28rpx;
+			// top: 148rpx;
 			
 		}
 	}

+ 104 - 11
pages_manage/emergencyEvacuationBig.vue

@@ -65,6 +65,7 @@
                   :style="'width:'+mapWidth+'rpx;height:'+mapHeight+'rpx;transform: scale('+zoomData+');margin-top:-'+mapHeight/2+'rpx;margin-left:-'+mapWidth/2+'rpx;'">
               <view class="map-max-box" :style="'width:'+mapWidth+'rpx;height:'+mapHeight+'rpx;'">
                 <view class="map-max-for-box for-map-box" v-if="item.type == 1"
+					  @click="lookGas(item)"
                       v-for="(item,index) in mapList":key="index"
                       :class="!item.policeType && checkSubId ==item.subId ? 'room-type-one':(
 									item.policeType && checkSubId !=item.subId ? 'room-type-two':(
@@ -80,8 +81,7 @@
                           v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
                           :style="'top:'+minItem.y+'rpx;left:'+minItem.x+'rpx;width:'+minItem.w+'rpx;height:'+minItem.h+'rpx;'">
                     </view>
-					<view class="gas-img-position">
-					</view>
+					<view class="gas-img-position" v-if="item.subBottle"></view>
                   </view>
                 </view>
                 <view class="map-max-for-box for-map-box-one" v-if="item.type == 2" v-for="(item,index) in mapList"
@@ -105,7 +105,20 @@
             </view>
           </view>
         </view>
-        <!-- 一键灭火 -->
+        <!-- 气瓶数据 -->
+		<view v-if="lookGasType" class="look-gas-bottle-box">
+			<view class="title-name-p">{{lookGasBottleName}}</view>
+			<view class="title-num-p">气瓶总量:{{lookGasBottleNum}}瓶</view>
+			<view class="look-for-box" v-for="(item,index) in lookGasList" :key="index">
+				<view class="look-min-box">
+					<img class="look-img" src="@/images/evacuation3_2/gasBottleAlarm.png">
+					<view class="look-name">{{item.name}}</view>
+					<view class="look-size">({{item.bottleSize}})</view>
+				</view>
+			</view>
+			<!-- <view class="look-out-button" @click="offLookGas">x</view> -->
+		</view>
+		<!-- 一键灭火 -->
         <view class="outfire" v-if='fireType'>
           <view class="outfire_li" v-if="!fireListType">
             <img src="@/pages_manage/images/icon_sy_wt.png">
@@ -233,7 +246,8 @@ import {
   executeEvacuation,
   endEvacuation,
   selectTriggerInfo,
-  riskPlanId
+  riskPlanId,
+  airbottleStockFindClassifyBySubId
 } from '@/api/index.js'
 export default {
   data() {
@@ -353,6 +367,11 @@ export default {
       outfireData: {}, //一键灭火
 	  groupId:null,
 	  planStatus:false,
+	  //查看气瓶
+	  lookGasType:false,
+	  lookGasList:[],
+	  lookGasBottleName:"",
+	  lookGasBottleNum:"",
     }
   },
   onLoad(option) {
@@ -451,6 +470,25 @@ export default {
 			});
 		}
 	},
+	//查看气瓶数据
+	async lookGas(item){
+		const {data} = await airbottleStockFindClassifyBySubId({subId:item.subId});
+		if(data.code == 200){
+			if(data.data.classifyList[0]){
+				this.$set(this,'lookGasBottleName',item.subName);
+				this.$set(this,'lookGasBottleNum',data.data.total);
+				this.$set(this,'lookGasList',data.data.classifyList);
+				this.$set(this,'lookGasType',true);
+			}else{
+				this.$set(this,'lookGasList',[]);
+				this.$set(this,'lookGasType',false);
+			}
+		}
+	},
+	offLookGas(){
+		this.$set(this,'lookGasType',false);
+		this.$set(this,'lookGasList',[]);
+	},
     //全屏疏散页面
     goAllPage() {
       let obj = {
@@ -1124,6 +1162,7 @@ export default {
                   list[i].subId = data.data.buildFloorLayoutVoList[o].subId;
                   list[i].online = data.data.buildFloorLayoutVoList[o].online;
                   list[i].loginAdmin = data.data.buildFloorLayoutVoList[o].loginAdmin;
+                  list[i].subBottle = data.data.buildFloorLayoutVoList[o].subBottle;
                   list[i].policeType = false;
                 }
               }
@@ -1592,7 +1631,7 @@ export default {
       margin: 20rpx 20rpx;
       /* background #fff */
       border-radius: 20rpx;
-      padding: 20rpx 0 30rpx;
+      padding: 20rpx 0 150rpx;
 
       .evacuation-title-box {
         // height:150rpx;
@@ -1863,15 +1902,18 @@ export default {
                 flex-direction: column;
 
                 .map-max-for-min-box {
+				  width:100%;
+				  height:100%;
                   position: relative;
 				  .gas-img-position{
 					z-index:999;
 					position: absolute;
-					bottom:2rpx;
-					right:2rpx;
-					width:14rpx;
-					height:36rpx;
-					background: url("../images/evacuation3_2/gasBottleAlarm_a.png") !important;
+					display: block;
+					bottom:6rpx;
+					right:6rpx;
+					width:10rpx;
+					height:24rpx;
+					background: url("../images/evacuation3_2/gasBottleAlarm_a.png") center center no-repeat !important;
 				  }
                   .position-box {
                     position: absolute;
@@ -2006,7 +2048,58 @@ export default {
         }
 
       }
-
+	  .look-gas-bottle-box{
+		width: 710rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		position: relative;
+		.title-name-p{
+		  color:#0183fa;
+		  line-height:60rpx;
+		  font-size:24rpx;
+		  text-align: center;
+		}
+		.title-num-p{
+		  line-height:60rpx;
+		  font-size:24rpx;
+		  text-align: center;
+		}
+		.look-for-box{
+		  display: inline-block;
+		  .look-min-box{
+			display: flex;
+			margin-left:20rpx;
+			width:200rpx;
+			.look-img{
+			  width:20rpx;
+			  height:52rpx;
+			  margin:10rpx 10rpx 10rpx 0;
+			}
+			.look-name{
+			  line-height:72rpx;
+			  font-size:24rpx;
+			}
+			.look-size{
+			  line-height:72rpx;
+			  font-size:24rpx;
+			}
+		  }
+		}
+		.look-out-button{
+		  width:28rpx;
+		  height:28rpx;
+		  position: absolute;
+		  top:10rpx;
+		  right:10rpx;
+		  color:#666;
+		  cursor: pointer;
+		  font-size:28px;
+		  z-index:10;
+		}
+	  }
       .video-max-box {
         width: 710rpx;
         height: 780rpx;