From 36e8795b59c7f7393758ca96e0c2438eddaee8be Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index 71d216f..68476e3 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -25,9 +25,6 @@
<script>
import EqumentDetaiModel from './EqumentDetaiModel'
import {getFileAccessHttpUrl} from '@/api/manage';
- import {
- getAction
- } from '@/api/manage'
export default {
name: 'EquipmentLayout',
@@ -55,6 +52,7 @@
}
return getFileAccessHttpUrl(img)
},
+
getStatusImgUrl(imgStaus){
if(imgStaus == 1){
return require("../../../../../assets/yellow.png");
@@ -70,12 +68,9 @@
return require("../../../../../assets/gray.png");
}
},
- getBackgroundUrl(imgurl){
- return require("../../../../../assets/"+imgurl+".gif");
- },
+
openDetail(item) {
if(item.oporation == 0){
- // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
this.$notification.warning({
message:'娑堟伅',
description:"璁惧澶勪簬鍏虫満鐘舵�侊紒"
@@ -85,15 +80,8 @@
console.log(item);
this.$refs.equmentDetaiModel.initData(item.id);
this.$refs.equmentDetaiModel.timerModel(item.id);
- // this.equipMessageTimer = setInterval(() => {
- // setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
- // },1000*10)
}
},
- beforeDestroy(){
- // clearInterval(this.equipMessageTimer);
- // this.equipMessageTimer = null
- }
}
</script>
<style scoped>
--
Gitblit v1.9.3