Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-manager-control

config/proxy.ts

@@ -9,20 +9,12 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/sgadmin/duoduo-service': {
-      //target: 'https://duoduoenv.sagacloud.cn/',
+    '/sgadmin': {
+      //   target: 'https://duoduoenv.sagacloud.cn/',
       target: 'http://10.100.28.79',
       changeOrigin: true,
       pathRewrite: {
-        '^/sgadmin/duoduo-service': '/sgadmin/duoduo-service',
-      },
-    },
-    '/sgadmin/sso': {
-      //target: 'https://duoduoenv.sagacloud.cn/',
-      target: 'http://10.100.28.79',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/sgadmin/sso': '/sgadmin/sso',
+        '^/sgadmin': '/',
       },
     },
   },

src/pages/Equipment/components/deviceModal/index.jsx

@@ -54,19 +54,19 @@ export default ({ onClose, showSpace }) => {
         },
         humidity: {
           range: [30, 70],
-          text: ['干燥', '适宜', '湿润'],
+          text: ['干燥', '健康', '潮湿'],
         },
         co2: {
-          range: [800, 1500],
-          text: ['适宜', '偏高', '超标'],
+          range: [800, 1000, 1500],
+          text: ['健康', '达标', '略高', '超标'],
         },
         pm25: {
-          range: [35, 75],
-          text: ['优', '良', '差'],
+          range: [35, 75, 115, 150, 250],
+          text: ['健康', '良', '轻度污染', '中度污染', '重度污染', '严重污染'],
         },
         hcho: {
-          range: [0.08, 0.1],
-          text: ['适宜', '偏高', '超标'],
+          range: [0.1],
+          text: ['健康', '超标'],
         },
       };
       let sortArr = [value, ...objList[name].range].sort((a, b) => {
@@ -86,7 +86,6 @@ export default ({ onClose, showSpace }) => {
   const [paramList, setParamList] = useState([]);
   const [timeArr, setTimeArr] = useState([]);
   let timer = useRef(null);
-  console.log(showSpace, 'showSpace');
   function showEqCard(type) {
     let flag = false;
     showSpace.equipList &&