Merge branch 'main' of http://42.192.7.176:3000/suojin/jiahe_device

src/router/axios.js

@@ -66,7 +66,6 @@ axios.interceptors.response.use(
     const status = res.data.code || res.status;
     const statusWhiteList = website.statusWhiteList || [];
     const message = res.data.msg || res.data.error_description || "未知错误";
-    console.log("status ===>", status);
     //如果在白名单里则自行catch逻辑处理
     if (statusWhiteList.includes(status)) return Promise.reject(res);
     //如果是401则跳转到登录页面

src/views/energySources/component/equipmentStatus.vue

@@ -89,13 +89,13 @@ export default {
           let y = this.$moment().format('yyyy-MM-DD')
           // let s = `${y} ${m.time}`
           return {
-            value: this.$moment(`${y} ${m.time}`).valueOf(),
+            value: this.$moment(`${y} ${m ? m.time : null}`).valueOf(),
             itemStyle: {
               normal: {
-                color: m.runStatus == 2 ? "#44516d" : '#0084FF',
+                color: m ? m.runStatus == 2 ? "#44516d" : '#0084FF' : '',
               },
             },
-            runStatus: m.runStatus
+            runStatus: m ? m.runStatus : null
           };
         })
         seriesData.push({