Browse Source

地图修改

zhaojijng 3 years ago
parent
commit
3b7edb48d4
3 changed files with 16 additions and 11 deletions
  1. 8 5
      src/pages/Environment/index.tsx
  2. 4 3
      src/pages/Equipment/index.tsx
  3. 4 3
      src/pages/Runtime/index.tsx

+ 8 - 5
src/pages/Environment/index.tsx

@@ -228,6 +228,8 @@ const Environment: React.FC = () => {
           })}
         </div>
       </div>
+      {/* background: repeating-linear-gradient(
+45deg, #ECEFF4, #ffffff 8px); */}
       <Map
         type={'enviroment'}
         searchText={searchText}
@@ -243,11 +245,12 @@ const Environment: React.FC = () => {
                 top: item.top,
                 width: item.width,
                 height: item.height,
-                backgroundColor:
-                  'rgba(' +
-                  selNav.colorStr +
-                  (selNav.opacity as number) * getColorOpacity(item.avgValues) +
-                  ')',
+                background: item.roomFuncType
+                  ? 'rgba(' +
+                    selNav.colorStr +
+                    (selNav.opacity as number) * getColorOpacity(item.avgValues) +
+                    ')'
+                  : 'repeating-linear-gradient(45deg, rgb(226 226 226), #ffffff 8px)',
               }}
             >
               <div className={mapstyles.content}>

+ 4 - 3
src/pages/Equipment/index.tsx

@@ -177,10 +177,11 @@ const Environment: React.FC = () => {
                 top: item.top,
                 width: item.width,
                 height: item.height,
-                backgroundColor:
-                  selNav.id == 'all'
+                background: item.roomFuncType
+                  ? selNav.id == 'all'
                     ? 'rgba(196, 196, 196, 0.2)'
-                    : getColorOpacity(item[selNav.id]),
+                    : getColorOpacity(item[selNav.id])
+                  : 'repeating-linear-gradient(45deg, rgb(226 226 226), #ffffff 8px)',
               }}
             >
               {selNav.id == 'all' && (

+ 4 - 3
src/pages/Runtime/index.tsx

@@ -184,12 +184,13 @@ const Runtime: React.FC = () => {
                 top: item.top,
                 width: item.width,
                 height: item.height,
-                backgroundColor:
-                  item.runTimeStatus == 'overtimeBook'
+                background: item.roomFuncType
+                  ? item.runTimeStatus == 'overtimeBook'
                     ? 'rgba(0, 220, 35, 0.2)'
                     : item.runTimeStatus == 'overtimeWork'
                     ? 'rgba(94, 139, 207, 0.2)'
-                    : 'rgba(196, 196, 196, 0.2)',
+                    : 'rgba(196, 196, 196, 0.2)'
+                  : 'repeating-linear-gradient(45deg, rgb(226 226 226), #ffffff 8px)',
               }}
             >
               <div className={mapstyles.allTime}>