diff --git a/src/assets/indexImg/Hazardous.png b/src/assets/indexImg/Hazardous.png
new file mode 100644
index 0000000..0174dd2
Binary files /dev/null and b/src/assets/indexImg/Hazardous.png differ
diff --git a/src/components/data-view/index.vue b/src/components/data-view/index.vue
index 35fb2f6..dc3ce28 100644
--- a/src/components/data-view/index.vue
+++ b/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 {
diff --git a/src/http/guojian/index.ts b/src/http/guojian/index.ts
index 8b358c3..444a0e1 100644
--- a/src/http/guojian/index.ts
+++ b/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')
+}
+
diff --git a/src/views/Hazardous/components/HDialog.vue b/src/views/Hazardous/components/HDialog.vue
index da49078..c88380b 100644
--- a/src/views/Hazardous/components/HDialog.vue
+++ b/src/views/Hazardous/components/HDialog.vue
@@ -44,7 +44,7 @@
- {{ scope.row.status == '0'?'离线':'在线' }}
+ {{ scope.row.status == '0'?'关闭':'开启' }}
@@ -104,11 +104,11 @@ let background = ref(false);
const alarmTypeOptions = [
{
value: '0',
- label: '离线',
+ label: '关闭',
},
{
value: '1',
- label: '在线',
+ label: '开启',
},
]
const emits = defineEmits(["update:dialogTableVisible", "getDialogdatafun"]);
diff --git a/src/views/Hazardous/index.vue b/src/views/Hazardous/index.vue
index 0d2a589..ec2b679 100644
--- a/src/views/Hazardous/index.vue
+++ b/src/views/Hazardous/index.vue
@@ -39,7 +39,10 @@
-
+
@@ -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)
diff --git a/src/views/index.vue b/src/views/index.vue
index 5f7a8b2..0e7c75e 100644
--- a/src/views/index.vue
+++ b/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,