diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index cfd7755..b7857fc 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -13,9 +13,9 @@
{{ changeNum(item) }}号风机
-
-
- 状态:{{ item.breakdown ? '故障' : '运行' }} +
+
+ 状态:{{ item.breakdown ? '故障' : item.running ? '运行' : '故障' }}
{ }) } const handleOpenChart = (item) => { - nextTick(()=>{ - if(chooseMonthRef.value){ + nextTick(() => { + if (chooseMonthRef.value) { chooseMonthRef.value.clearData() } - if(chooseDayRef.value){ + if (chooseDayRef.value) { chooseDayRef.value.clearData() } }) @@ -363,10 +363,10 @@ const getImage = (type) => { } } const changeNum = (item) => { - switch (item.equipmentId) { - case 22: + switch (item.equipmentName) { + case '1号变频器': return '一'; - case 23: + case '2号变频器': return '二'; } } @@ -511,10 +511,13 @@ const handleOnMounted = () => { fan01_option && Echarts_info1.setOption(fan01_option); } } - -const getImageUrl = (name) => { - let icon = getImage(name) - return new URL(`../../../assets/images/fanInfo/${icon}`, import.meta.url).href +const changeStopColor = (breakdown, running) => { + console.log('breakdown,running', breakdown, running) + if (breakdown) { + return true + } else { + return !running; + } } /** * 初始化echarts实例方法 diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue index d88500d..f5b810b 100644 --- a/src/components/content/tunnelScene/PreviewScene.vue +++ b/src/components/content/tunnelScene/PreviewScene.vue @@ -174,10 +174,10 @@ async function handleMounted() { return } else { console.log(err); - ElMessage({ - message: "场景初始化异常---!", - type: "warning", - }); + // ElMessage({ + // message: "场景初始化异常---!", + // type: "warning", + // }); } } } diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue index d61b253..367563e 100644 --- a/src/components/content/tunnelScene/TunnelScene.vue +++ b/src/components/content/tunnelScene/TunnelScene.vue @@ -117,10 +117,10 @@ async function handleMounted() { demo.SignsInf(params.form.tunnelAlias, String(params.tunnelLength)) } catch (err) { console.log(err); - ElMessage({ - message: "场景初始化异常---!", - type: "warning", - }); + // ElMessage({ + // message: "场景初始化异常---!", + // type: "warning", + // }); } }