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

src/api/components/supermap.js

@@ -39,5 +39,5 @@ export function queryMap(deptId) {
 export const iconList = {
   'marker': require('@/assets/icons/supermap/marker.png'),
   'positioning': require('@/assets/icons/supermap/positioning.png'), // 地图选点照片
-  'hzqy': require('@/assets/images/sentinel/hz_qy.png'),
+  'hzqy': require('@/assets/icons/supermap/hz_qy.png'),
 }

src/views/SenEquipmentCenter.vue

@@ -38,13 +38,12 @@
 					<span class="dt3">定位</span>
 				</dt>
 				<div class="hei_scroll hei56">
-					<dd v-for="(e,idx) in deviceListSearch" :key="idx">
+					<dd v-for="(e,idx) in deviceListSearch" :key="idx" @click="dropLocation(e.latitude,e.longitude)">
 						<span class="dt1">{{ idx + 1 }}</span>
 						<span class="dt2">{{ e.deviceName }}</span>
 						<span class="dt3">
 							<img
 								style="cursor: pointer;"
-								@click="dropLocation(e.latitude,e.longitude)"
 								src="../assets/images/sentinel/hz_list_d.png"
 							/>
 						</span>
@@ -61,11 +60,11 @@
 		</div>
 		<div class="visual-body">
 			<!--弹框演示模板 开始-->
-			<img src="../assets/images/sentinel/hz_qy.png" class="qydw1"/>
+			<!-- <img src="../assets/images/sentinel/hz_qy.png" class="qydw1"/>
 			<img src="../assets/images/sentinel/hz_qy.png" class="qydw2"/>
-			<img src="../assets/images/sentinel/hz_qy.png" class="qydw3"/>
+			<img src="../assets/images/sentinel/hz_qy.png" class="qydw3"/> -->
 			<div class="tk_div">
-				<div class="tk1 tk_bor">
+				<div class="tk1 tk_bor" style="height: 72%;">
 					<h1>GGB19329<i>使用中</i></h1>
 					<p>设备名称：GGB19329</p>
 					<p>设备类型：燃气哨兵</p>
@@ -75,7 +74,7 @@
 					<p>安装位置：XXX大路于XXX大街交汇南100米</p>
 					<p>历史数值：<a  @click="toggleDisplay">详情</a></p>
 				</div>
-				<div class="tk2 tk_bor"  v-if="isVisible">
+				<div class="tk2 tk_bor"  v-if="isVisible" style="width: 54%;">
 					<h1>哨兵详情</h1>
 					<div id="sbxqChart" ref="MyChart"></div>
 				</div>
@@ -146,9 +145,13 @@
 				// 所属区域：address
 				// 设备名称：deviceName
 				// 设备类型：deviceTypeText
+				this.deviceDetailInfo = {
+					deviceName:res.data.deviceName,
+				}
 
 			})
 			selectDailyThreshold().then(res => {
+				
 			})
 		},
 		mounted() {
@@ -477,6 +480,87 @@
 		height: 77px;
 	}
 
+	.tk_div{
+		width: 45%;
+		height: 50%;
+		position: absolute;
+		top: 24%;
+		left: 32.2%;
+		z-index: 98;
+		display: flex;
+		flex-direction: row;
+	}
+	.tk_bor{
+		padding: 15px!important;
+		border: 3px solid #28727e;
+		box-shadow: 0px 0px 24px #28727e;
+		background: rgba(0,0,0,0.39);
+	}
+	.tk_bor h1{
+		padding-left: 20px;
+		background: url("../assets/images/sentinel/hz_k.png") no-repeat left;
+		font-size: 18px;
+		color: #e0e5fa;
+		font-weight: bold;
+		height: 38px;
+		line-height: 38px;
+	}
+	.tk_bor h1 i{
+		display: inline-block;
+		float: right;
+		background: #3bad96;
+		padding: 0px 10px;
+		color: #fff;
+		font-size: 16px;
+		height: 30px;
+		line-height: 30px;
+		position: relative;
+		border-radius: 4px;
+	}
+	.tk_bor h1 i::after{
+		display: block;
+		content: '';
+		border-bottom: 9px solid transparent;
+		border-right: 9px solid #3bad96;
+		border-top: 9px solid transparent;
+		position: absolute;
+		left:-8px;
+		top:8px;
+	}
+	.tk_bor p{
+		padding-left: 20px;
+		background: url("../assets/images/sentinel/hz_k.png") no-repeat left;
+		background-size: 12px;
+		font-size: 16px;
+		color: #fff;
+		line-height: 35px;
+	}
+	.tk_bor p a{
+		color: #6bf5f2;
+		text-underline-offset: 0.4em;
+		text-decoration: underline;
+	}
+	.tk_bor p a:hover{
+		color: #6bf5f2;
+		text-underline-offset: 0.4em;
+		text-decoration: underline;
+		cursor: pointer;
+	}
+	.tk1{
+		position: relative;
+		margin-right: 20px!important;
+	}
+	//  .tk1::after{
+	// 	display: block;
+	// 	content: '';
+	// 	background: url("../assets/images/sentinel/hz_down.png") no-repeat left;
+	// 	width: 46px;
+	// 	height: 40px;
+	// 	position: absolute;
+	// 	bottom:-40px;
+	// 	left: 50%;
+	// 	transform: translateX(-50%);
+	//  }
 	#sbxqChart{
 		width: 250px;
 		height: 200px;