Browse Source

湿度颜色的改变

zhaojijng 2 years ago
parent
commit
688d3ce2a6
2 changed files with 18 additions and 15 deletions
  1. 16 9
      src/pages/Environment/index.tsx
  2. 2 6
      src/services/sagacare_service/environment.ts

+ 16 - 9
src/pages/Environment/index.tsx

@@ -60,9 +60,15 @@ const Environment: React.FC = () => {
       src: envir_wet,
       unit: '%',
       color: '#9FB7CD',
-      colorStr: '159,183,205,',
-      opacity: 0.2,
-      indicator: [25, 35, 45, 55, 65],
+      colorStr: [
+        'rgba(255, 232, 35, 0.4)',
+        ' rgba(255, 232, 35, 0.2)',
+        'rgba(159, 183, 205, 0.2)',
+        'rgba(94, 139, 207, 0.4)',
+        'rgba(94, 139, 207, 0.8)',
+      ],
+      opacity: 1,
+      indicator: [0, 20, 40, 60, 80],
       fixed: 1,
     },
     {
@@ -73,7 +79,7 @@ const Environment: React.FC = () => {
       color: '#00DC23',
       colorStr: '0,220,35,',
       opacity: 0.2,
-      indicator: [500, 700, 1000, 2000, 3000],
+      indicator: [0, 500, 1000, 1500, 2000],
       fixed: 0,
     },
     {
@@ -84,7 +90,7 @@ const Environment: React.FC = () => {
       color: '#E89E32',
       colorStr: '232,158,50,',
       opacity: 0.2,
-      indicator: [15, 25, 35, 75, 90],
+      indicator: [0, 20, 80, 140, 200],
       fixed: 1,
     },
     {
@@ -95,7 +101,7 @@ const Environment: React.FC = () => {
       color: '#140050',
       colorStr: '20,0,80,',
       opacity: 0.25,
-      indicator: [0.02, 0.05, 0.1, 0.15], //指标梯度
+      indicator: [0, 0.05, 0.1, 0.15], //指标梯度
       fixed: 2,
     },
   ]);
@@ -159,6 +165,7 @@ const Environment: React.FC = () => {
             width: (res.data || {}).width * mscale,
             height: (res.data || {}).height * mscale,
           };
+
           setMapSize(mapSize);
 
           data.forEach((item, index) => {
@@ -294,7 +301,7 @@ const Environment: React.FC = () => {
           {(selNav.indicator || []).map((item, index) => {
             return (
               <div
-                className={cx(styles.indicatorBox, { [styles.tdbIndicator]: selNav.id == 'Tdb' })}
+                className={cx(styles.indicatorBox, styles.tdbIndicator)}
                 key={index + 'indicator'}
               >
                 <div className={styles.text}>{item == 0 ? '' : item}</div>
@@ -302,7 +309,7 @@ const Environment: React.FC = () => {
                   className={styles.color}
                   style={{
                     backgroundColor:
-                      selNav.id == 'Tdb'
+                      selNav.id == 'Tdb' || selNav.id == 'RH'
                         ? selNav.colorStr[index]
                         : 'rgba(' +
                           selNav.colorStr +
@@ -344,7 +351,7 @@ const Environment: React.FC = () => {
                   style={{
                     background: item.roomFuncType
                       ? item.avgValues || item.avgValues == 0
-                        ? selNav.id == 'Tdb'
+                        ? selNav.id == 'Tdb' || selNav.id == 'RH'
                           ? selNav.colorStr[getColorOpacity(item.avgValues) - 1]
                           : 'rgba(' +
                             selNav.colorStr +

+ 2 - 6
src/services/sagacare_service/environment.ts

@@ -66,12 +66,8 @@ function getProjectId() {
 function commonParams() {
   var userObj = UserStorage.getInstance();
   const user = userObj.getUser();
-  var pubname = '';
-  if (getProjectId() == 'Pj3301100002') {
-    pubname = 'sgadmin';
-  } else {
-    pubname = 'sagacareAndtenantslink';
-  }
+  var pubname = 'sgadmin';
+
   return `openid=${user.id}&pubname=${pubname}&projectId=${getProjectId()}&userId=${
     user.id
   }&userName=${user.name}`;