浏览代码

Updated - 哨兵 更改落点定位

yhfu 3 周之前
父节点
当前提交
287472d865
共有 3 个文件被更改,包括 24 次插入19 次删除
  1. 1 1
      src/api/components/supermap.js
  2. 二进制
      src/assets/icons/supermap/hz_qy.png
  3. 23 18
      src/views/Sentinel.vue

+ 1 - 1
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/assets/icons/supermap/hz_qy.png


+ 23 - 18
src/views/Sentinel.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() {
@@ -211,7 +214,7 @@
 						setTimeout(() => {
 							this.$refs.supermap.clearM();
 							this.$refs.supermap.clearMRadius();
-							this.$refs.supermap.setMarkersRadius(deviceMarkersList);
+							this.$refs.supermap.setMarkers(deviceMarkersList);
 						}, 1000);
 					} else {
 						setTimeout(() => {
@@ -686,6 +689,8 @@
 	}
 
 	.tk_div{
+		width: 45%;
+		height: 50%;
 		position: absolute;
 		top: 24%;
 		left: 32.2%;
@@ -753,17 +758,17 @@
 		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%);
-	}
+	//  .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;