From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/DeviceBaseInfo.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index 3c7ccf1..b697ecf 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -36,7 +36,7 @@
<equipment-layout :dataList="dataList" :equipmentId="selectEquementId" :node="selectEquement"></equipment-layout>
</a-tab-pane>
<a-tab-pane key="2" tab="鍒楄〃" force-render>
- <equipment-list :dataSource="dataList"></equipment-list>
+ <equipment-list :dataSource="dataList" @editEquipmentStatus="editEquipmentStatus"></equipment-list>
</a-tab-pane>
</a-tabs>
</div>
@@ -81,8 +81,10 @@
workNumber: 0,
allNumber: 0,
url: {
- list: '/mdc/mdcEquipment/queryEquipmentMonitorList'
+ list: '/mdc/mdcEquipment/queryEquipmentMonitorList',
+ updateEquipmentStatus:'/mdc/mdcEquipment/updateEquipmentStatus'
},
+ param:{},
timer:null,
timerzhun:null
}
@@ -92,7 +94,7 @@
// setInterval(this.equipmentStatistics(), 5*1000);
},
methods: {
- equipmentStatistics(param) {
+ equipmentStatistics(param,resopnse={key:false}) {
getAction(this.url.list, param).then((res) => {
this.dataList = []
if (res.success) {
@@ -105,6 +107,13 @@
this.dataList = res.result
// console.log(this.dataList)
this.allNumber = this.dataList.length
+ if(resopnse.key){
+ this.$notification.success({
+ key:'equipmentStatus',
+ message: '娑堟伅',
+ description: resopnse.message,
+ });
+ }
for (let i = 0; i < this.dataList.length; i++) {
let item = this.dataList[i]
switch (item.oporationDict) {
@@ -140,24 +149,54 @@
this.selectEquement = val.equipmentId
clearInterval(this.timer);
this.timer = null
- let param = {}
if (!val.equipmentId) {
- param.key = val.key
+ this.param.key=val.key
clearInterval(this.timerzhun);
this.timerzhun = null
- this.equipmentStatistics(param)
+ this.equipmentStatistics(this.param)
this.timer = setInterval(() => {
- setTimeout( this.equipmentStatistics(param),0)
+ setTimeout( this.equipmentStatistics(this.param),0)
},1000*10)
}else{
- param.key = val.parentId
+ this.param.key=val.parentId
clearInterval(this.timerzhun);
this.timerzhun = null
- this.equipmentStatistics(param)
+ this.equipmentStatistics(this.param)
this.timer = setInterval(() => {
- setTimeout( this.equipmentStatistics(param),0)
+ setTimeout( this.equipmentStatistics(this.param),0)
},1000*10)
}
+ },
+
+ /**
+ * 鍗曞嚮鐘舵�佸弽棣堝悗瑙﹀彂
+ * @param record
+ */
+ editEquipmentStatus(record){
+ console.log('瀛愮粍浠秗ecord',record.id)
+ const _this=this
+ this.$notification.info({
+ key:'equipmentStatus',
+ message: '娑堟伅',
+ description: '鍙嶉涓�...',
+ });
+ getAction(this.url.updateEquipmentStatus,{id:record.id})
+ .then(res=>{
+ if(res.success) {
+ _this.equipmentStatistics(this.param,{key:true,message:res.message})
+ }else{
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ })
+ .catch(err=>{
+ this.$notification.error({
+ message:'娑堟伅',
+ description:err.message
+ });
+ })
}
},
mounted(){
--
Gitblit v1.9.3