危废品箱大屏

src/components/data-view/index.vue

@@ -466,6 +466,7 @@ export default {
     white-space: normal;
     flex-wrap: wrap;
     align-items: center;
+    justify-content: center;
 }
 
 .zd-scroll-board .rows .index {

src/http/guojian/index.ts

@@ -9,3 +9,7 @@ export function getAirWind(data:any){
     return get('/guoJian/getAirWind',data)
 }
 
+export function getGuoJianAlarmRecord(){
+    return get('/guoJian/getGuoJianAlarmRecord')
+}
+

src/views/Hazardous/components/HDialog.vue

@@ -44,7 +44,7 @@
         <el-table-column property="time" label="时间" header-align="center" align="center" />
         <el-table-column label="状态" header-align="center" align="center" width="120">
           <template #default="scope">
-            <text> {{ scope.row.status == '0'?'离线':'在线' }}</text>
+            <text> {{ scope.row.status == '0'?'关闭':'开启' }}</text>
           </template>
         </el-table-column>
       </el-table>
@@ -104,11 +104,11 @@ let background = ref(false);
 const alarmTypeOptions = [
   {
     value: '0',
-    label: '离线',
+    label: '关闭',
   },
   {
     value: '1',
-    label: '在线',
+    label: '开启',
   },
 ]
 const emits = defineEmits(["update:dialogTableVisible", "getDialogdatafun"]);

src/views/Hazardous/index.vue

@@ -39,7 +39,10 @@
                 </div>
                 <div class="box2">
                     <Border :title="'报警记录'">
-                        <scrollBoard ref="scrollBoardRef" :config="board_config"></scrollBoard>
+                        <ZdScrollBoard ref="devList" :config="board_config" :style="{
+                    width: '100%',
+                    height: '100%',
+                }" />
                     </Border>
                 </div>
             </div>
@@ -58,10 +61,10 @@ import header2 from '@/components/headerBox/header2.vue'
 import Border from './components/Border.vue';
 import Card from './components/Card.vue';
 import LineChart from './components/LineChart.vue';
-import scrollBoard from './components/scrollBoard.vue';
+import ZdScrollBoard from "@/components/data-view/index.vue";
 import HDialog from './components/HDialog.vue';
 
-import { getGuoJian24Trend, getAirWind } from '@/http/guojian/index'
+import { getGuoJian24Trend, getAirWind,getGuoJianAlarmRecord } from '@/http/guojian/index'
 
 let timer = null
 let titleTip = [
@@ -149,14 +152,13 @@ const calc = reactive({
     data: [],
     xAxis: [],
 })
-let scrollBoardRef = ref()
+let devList = ref()
 let board_config = reactive({
     header: ['报警时间', '名称', '状态', '持续时长'],
     headerBGC: '#081B56',
-    oddRowBGC: '#000F1D',
-    evenRowBGC: '#000F1D',
+    oddRowBGC: '#0B1E2A',
+    evenRowBGC: '#100c2a',
     wrap: [true, true, true, true],
-    columnWidth: [131, 175, 120, 140],
     align: ['center', 'center', 'center', 'center'],
     rowNum: 8,
     waitTime: 3000,
@@ -254,8 +256,25 @@ async function getDialogdatafun(config) {
         }, 0);
     }
 }
+
+async function getGuoJianAlarmRecordList() {
+    let result: any = await getGuoJianAlarmRecord();
+    if (result.code == 200) {
+        let updateList = result.data.map((items: any) => {
+            //['报警时间', '名称', '状态', '持续时长']
+            return [
+                items.time,
+                items.name,
+                items.status,
+                items.sum + '分钟',
+            ]
+        })
+        devList.value.updateRows(updateList,board_config)
+    }
+}
 onMounted((() => {
     getGuoJian24TrendData()
+    getGuoJianAlarmRecordList()
     timer = setInterval(() => {
         getGuoJian24TrendData()
     }, 1000 * 60)

src/views/index.vue

@@ -228,6 +228,12 @@ let routerList = [
     title: '设备物联工况系统列表',
     url: require("../assets/indexImg/MicroExhibitionTable.png"),
   },
+  {
+    id: 34,
+    path: "/Hazardous",
+    title: '危废品箱物联检测系统',
+    url: require("../assets/indexImg/Hazardous.png"),
+  },
   
   {
     id: 7,