diff --git a/src/api/publish/urgentMessage.js b/src/api/publish/urgentMessage.js
index bd5faed..19bc6cc 100644
--- a/src/api/publish/urgentMessage.js
+++ b/src/api/publish/urgentMessage.js
@@ -26,4 +26,12 @@ export function reqEditMessage(parameter) {
method: 'post',
data: parameter
})
+}
+// 改变紧急通知的状态
+export function reqChangeMessage(parameter) {
+ return request({
+ url: 'api/release/updateNoticeState',
+ method: 'post',
+ data: parameter
+ })
}
\ No newline at end of file
diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue
index c0a993b..55d831b 100644
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@@ -195,18 +195,6 @@
-
-
@@ -416,7 +404,7 @@ export default {
message: '修改设备成功'
})
this.addFromVisible = false
- this.getStartUpList()
+ this.getStartUpList(this.queryInfo.page)
}
})
} else {
@@ -457,7 +445,7 @@ export default {
message: '清空成功',
type: 'success'
})
- this.getStartUpList()
+ this.getStartUpList(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
}
}).catch(()=>{
this.$message({
@@ -471,7 +459,7 @@ export default {
handleSizeChange(size) {
//整理参数
this.queryInfo.size = size
- this.getPageList();
+ this.getStartUpList();
},
}
}
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index f42d14c..30e2066 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -263,8 +263,8 @@ export default {
},
methods: {
// 获取设备列表的数据
- getDevice(){
- // this.queryInfo.page=pager
+ getDevice(pager=1){
+ this.queryInfo.page=pager
const params = this.queryInfo
ReqDeviceList(params).then(res => {
console.log(res)
@@ -311,8 +311,8 @@ export default {
type: 'success'
})
// 解绑时 如果一页设备只剩下一个 则返回上一页
- this.getDevice()
- // this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1
+ this.getDevice(this.deviceList.length>1?this.queryInfo.page:this.queryInfo.page-1)
+
}
})
}).catch(()=>{
@@ -351,7 +351,7 @@ export default {
});
}
this.addFromVisible=false
- this.getDevice()
+ this.getDevice(this.queryInfo.page)
})
} else {
console.log('error submit!!')
@@ -375,10 +375,10 @@ export default {
handleSizeChange(size) {
//整理参数
this.queryInfo.size = size
- this.getPageList();
+ this.getDevice()
},
- }
+ }
}