From 2f11d9e2fe03b99eef732bafae972331581d4159 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 5 Jan 2024 11:22:19 +0800
Subject: [PATCH 1/2] fixed
---
admin/src/views/monitor_alarm/index.vue | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/monitor_alarm/index.vue b/admin/src/views/monitor_alarm/index.vue
index 9e014750..d02a4c54 100644
--- a/admin/src/views/monitor_alarm/index.vue
+++ b/admin/src/views/monitor_alarm/index.vue
@@ -44,17 +44,17 @@
-
-
-
-
+
+
+
+
-
- {{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}
-
-
+
+ {{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}
+
+
{
}
// 获取字典数据
-const { dictData } = useDictData('alarm_type')
+const { dictData } = useDictData('monitor_item')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -140,9 +140,9 @@ const detailData = reactive({
const handleDetail = (data: any) => {
detailData.gridData = [{}]
let deviceType = ''
- for (const key in dictData['alarm_type']) {
- if (dictData['alarm_type'][key]['value'] == data.type) {
- deviceType = dictData['alarm_type'][key]['name']
+ for (const key in dictData['monitor_item']) {
+ if (dictData['monitor_item'][key]['value'] == data.type) {
+ deviceType = dictData['monitor_item'][key]['name']
}
}
detailData.gridData.unshift({
From 66d829cff6f29011ea68c3c28fa08e4e3cf7fd96 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 5 Jan 2024 11:46:21 +0800
Subject: [PATCH 2/2] fixed
---
app/api/controller/dataview/LandController.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/api/controller/dataview/LandController.php b/app/api/controller/dataview/LandController.php
index 454c2071..7bf23c0b 100644
--- a/app/api/controller/dataview/LandController.php
+++ b/app/api/controller/dataview/LandController.php
@@ -61,7 +61,6 @@ class LandController extends BaseApiController
// 先排序,再分组
$subQuery = Db::name('land_collection')
->order('id', 'desc')
- ->limit(1000)
->buildSql();
$list = Db::table($subQuery)->alias('lc')