Merge remote-tracking branch 'origin/master'

src/api/components/supermap.js

@@ -18,5 +18,4 @@ export const iconList={
     "camera-not":require('@/assets/images/cameraType/camera-not.png'),
     "not-online":require('@/assets/images/cameraType/not-online.png'),
     "sensor":require('@/assets/images/cameraType/sensor.png'),
-    "icon_qxz":require('@/assets/images/cameraType/sensor.png'),
 }

src/api/datacenter.js

@@ -11,16 +11,7 @@ export function getResource() {
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
-    method: 'post',
-    data:{"resourceTable":resourceTable}
-  })
-}
-//点击右侧菜单列表查询落点
-export function getResourcePointByDeptId(resourceTable,deptId) {
-  return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
-    method: 'post',
-    data:{"resourceTable":resourceTable,"deptId":deptId}
+    url: '/center-fire/VisuForestDataCenterController/getResourcePoint?resourceTable='+resourceTable,
+    method: 'get',
   })
 }

src/assets/styles/base.scss

@@ -289,6 +289,20 @@ div::-webkit-scrollbar {
 		overflow: hidden;
 		background: #020406;
 		position: absolute;
+		.map-tip{
+			.d-l-con{
+				width: 100%;
+				box-shadow:none;
+				.d-l-l-text{
+					width: 100%;
+					white-space: nowrap;
+					h4{
+						display: flex;
+						color: #04080c;
+					}
+				}
+			}
+		}
 		//收起展开
 		.mascot{
 			position:fixed;

src/components/vBottomMenu.vue

@@ -43,6 +43,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 	@import '@/assets/styles/base.scss';
+	
 	.bottom-menu-normal {
 		max-width: 90%;
 		padding: 0 3rem;