Browse Source

fix:四川大厦的地图处理

chenzhen2 2 years ago
parent
commit
1f47637454

+ 1 - 1
src/styles/index.scss

@@ -161,7 +161,7 @@ div:focus {
   box-shadow: none;
   background-repeat: repeat;
   border: 2px solid #dfe3ed;
-  background-image: url('/borui/images/map-icon/bg_disable.png');
+  background-image: url('/sgipad/images/map-icon/bg_disable.png');
 }
 
 .main-left {

+ 10 - 6
src/utils/mapIcon.ts

@@ -48,10 +48,14 @@ export const mapIcon: any = {
     'selectIcon': 'coffeeselected.svg',
   },
   '普通办公区': {
-    'icon': 'dev.svg',
-    'selectIcon': 'devselected.svg',
-    'backgroundColor': '#DFE3ED',
-    'circleColor': '#7FBEFA'
+    // 'icon': 'dev.svg',
+    // 'selectIcon': 'devselected.svg',
+    'icon': 'officeroom.svg',
+    'selectIcon': 'officeroomselected.svg',
+    'backgroundColor': '#fff',
+    'circleColor': '#7582B0'
+    // 'backgroundColor': '#DFE3ED',
+    // 'circleColor': '#7FBEFA'
   },
   '办公室': {
     'backgroundColor': '#fff',
@@ -173,7 +177,7 @@ export const mapIcon: any = {
 /**
  * 房间类型
  */
-export const getSpaceType = function(type: any) {
+export const getSpaceType = function (type: any) {
   let typeName = '公共区域'
   if (type === '100' || type === '1A0' || type === '0' || type === '443' || type === '453') {
     typeName = '公共区域'
@@ -249,7 +253,7 @@ export const getSpaceType = function(type: any) {
  *  获取会议室加班类型
  * @param type
  */
-export const getWorkType = function(type: string) {
+export const getWorkType = function (type: string) {
   let typeName: any = '其它'
   if (type === '312' || type === '311' || type === '310') {
     typeName = '个人'

+ 1 - 0
src/views/envmonitor/components/Map/MapBox.vue

@@ -1385,6 +1385,7 @@ export default defineComponent({
       z-index: 666;
 
       img {
+        width: 40px;
         //margin-bottom: 6px;
       }
 

+ 8 - 3
src/views/envmonitor/components/Map/index.vue

@@ -170,19 +170,24 @@ export default defineComponent({
     font-size: 18px;
     line-height: 31px;
     /* identical to box height */
-    color: #646C73;
+    color: #646c73;
   }
   .map-top {
     position: fixed;
+    width: 100%;
     padding-top: 5px;
-    width: 160px;
-    right: 0px;
+    padding-bottom: 10px;
+    // width: 160px;
+    left: 0px;
     top: 30%;
     z-index: 333;
     border-radius: 10px;
+    text-align: right;
+    background: $elBg;
     span {
       width: 80px;
       height: 30px;
+      font-size: 16px;
       line-height: 30px;
       text-align: center;
       background: #fff;

+ 1 - 1
src/views/envmonitor/index.vue

@@ -1,4 +1,4 @@
-<template>
+                                <template>
   <div
     class="main"
     :style="{