From af05f4f5e453eac9569b9cda90358697805ee92c Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Wed, 1 Apr 2026 20:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E6=A3=9A=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/warn/message.js | 7 ++
components/addAgri/addAgri.vue | 8 +-
pages/home/control/index.vue | 14 ++-
pages/index.vue | 11 +-
pages/news/subpages/deviceCenter/index.vue | 125 ++++-----------------
5 files changed, 51 insertions(+), 114 deletions(-)
diff --git a/api/warn/message.js b/api/warn/message.js
index 3b5b177..3b1eb21 100644
--- a/api/warn/message.js
+++ b/api/warn/message.js
@@ -42,3 +42,10 @@ export function delMessage(id) {
method: 'delete'
})
}
+export function getMessages(query) {
+ return request({
+ url: '/warn/message/getMessage',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/components/addAgri/addAgri.vue b/components/addAgri/addAgri.vue
index 230727b..fa0a571 100644
--- a/components/addAgri/addAgri.vue
+++ b/components/addAgri/addAgri.vue
@@ -93,7 +93,7 @@ export default {
addAgriMobile(this.formData).then((response) => {
if (response.code===200) {
uni.showModal({
- title: `${response.data.code===1?"✅":"⚠️"}操作提示`,
+ title: `操作提示`,
content: `${response.data.msg}`,
showCancal: false,
confirmText: '确定',
@@ -102,9 +102,9 @@ export default {
if (res.confirm) {
this.$emit("reload"); // 向父组件传值触发刷新
batchUnsubscribe({clientId: mqttUtil.getMqttState().clientId}).then(response => {
- if (response.code === 200) {
- updateSubscribeTopic();
- }
+
+ }).finally(() => {
+ updateSubscribeTopic();
})
this.close(); // 关闭添加大棚的弹窗（移到这里）
}
diff --git a/pages/home/control/index.vue b/pages/home/control/index.vue
index b1a732e..5e37ee6 100644
--- a/pages/home/control/index.vue
+++ b/pages/home/control/index.vue
@@ -168,7 +168,7 @@ export default {
const agriInfo = JSON.parse(decodedStr); // 反序列化为原对象
this.value = agriInfo.imei;
this.selectedText = agriInfo.agriName;
- this.agriId = agriInfo.agriId;
+ this.agriId = (String(agriInfo.agriId));
this.currentMode = (agriInfo.workMode === 1)
this.change(this.value)
}
@@ -238,11 +238,13 @@ export default {
if (!this.currentMode) {
// 最新温湿度数据
findDtuDataByInfo(queryParams).then(response => {
- Object.keys(response.data).forEach(key => {
- this.liveData[key] = response.data[key] || '已离线..';
- });
- this.liveData.temp = "最后更新时间："+response.data.time;
- this.fontStyle = 'font-size:16px;'
+ if (response.code === 200 && response.data) {
+ Object.keys(response.data).forEach(key => {
+ this.liveData[key] = response.data[key] || '已离线..';
+ });
+ this.liveData.temp = "最后更新时间："+response.data.time;
+ this.fontStyle = 'font-size:16px;'
+ }
})
}
this.getAgriByImei();
diff --git a/pages/index.vue b/pages/index.vue
index c6af4b3..4d8e53b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -123,8 +123,9 @@ import {getNewSpecialData} from "../api/data/specialData";
import AddAgri from "../components/addAgri/addAgri.vue";
import {removeAgri} from "../api/system/assets/userAgri";
import * as mqttUtil from "../utils/mqtt";
-import {getAgriStatus} from "../api/system/mqtt";
+import {batchUnsubscribe, getAgriStatus} from "../api/system/mqtt";
import UniPopup from "../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
+import {updateSubscribeTopic} from "../utils/mqtt";
export default {
computed: {
@@ -341,6 +342,7 @@ export default {
onDeleteItem(e, item) {
if (e.content.text === '重命名') { // 通过事件对象的 content.text 判断
setTimeout(() => {
+ this.agriId = item.id;
this.agriName = item.agriName;
this.imei = item.imei;
this.$refs.renameAgri.open();
@@ -355,6 +357,10 @@ export default {
if (res.confirm) {
removeAgri(item).then(response => {
if (response.code === 200) {
+ batchUnsubscribe({clientId: mqttUtil.getMqttState().clientId}).then(response => {
+ }).finally(() => {
+ updateSubscribeTopic();
+ })
this.$modal.msgSuccess("删除成功！");
this.getListData();
} else {
@@ -522,7 +528,8 @@ export default {
if (res.confirm) {
renameAgriName({
imei: this.imei,
- newAgriName: this.newAgriName
+ newAgriName: this.newAgriName,
+ agriId: this.agriId
}).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("大棚重命名成功！");
diff --git a/pages/news/subpages/deviceCenter/index.vue b/pages/news/subpages/deviceCenter/index.vue
index cf03939..16a5bdc 100644
--- a/pages/news/subpages/deviceCenter/index.vue
+++ b/pages/news/subpages/deviceCenter/index.vue
@@ -20,24 +20,14 @@
class="message-item"
>
-
- {{ formatTime(item.time) }}
+
+ {{ formatTime(item.createTime) }}
-
-
-
-
- {{ "item "+index+" " +item.id }}
+
+ {{ item.content }}
@@ -52,88 +42,15 @@