Merge branch 'preview'

admin/src/views/monitor_alarm/index.vue

@@ -44,17 +44,17 @@
                         </template>
                     </el-table-column> 
                     <el-table-column label="监测类型" align="center" prop="type">
-    <template #default="{ row }">
-        <dict-value :options="dictData.alarm_type" :value="row.type" />
-    </template>
-</el-table-column>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.monitor_item" :value="row.type" />
+                        </template>
+                    </el-table-column>
                     <el-table-column label="报警内容" width="300" prop="content" show-overflow-tooltip />
                     <el-table-column label="报警数值" prop="value" show-overflow-tooltip />
                     <el-table-column label="报警时间" align="center" prop="create_time">
-    <template #default="{ row }">
-      <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
-    </template>
-</el-table-column>
+                        <template #default="{ row }">
+                          <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="140" align="center" fixed="right">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="handleDetail(row)"
@@ -123,7 +123,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-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({

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')