diff --git a/src/router/axios.js b/src/router/axios.js index 0c96024..cd39c9a 100644 --- a/src/router/axios.js +++ b/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则跳转到登录页面 diff --git a/src/views/energySources/component/equipmentStatus.vue b/src/views/energySources/component/equipmentStatus.vue index c6ef679..3de7669 100644 --- a/src/views/energySources/component/equipmentStatus.vue +++ b/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({