diff --git a/src/api/guojian/index.js b/src/api/guojian/index.js
new file mode 100644
index 0000000..98e67df
--- /dev/null
+++ b/src/api/guojian/index.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+//big/getScreen
+
+// 查询历史记录
+export function getGuoJianRecord(query) {
+ return request({
+ url: 'screen/guoJian/getGuoJianRecord',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询短信发送记录
+export function getSmsRecord(query) {
+ return request({
+ url: 'screen/guoJian/getSmsRecord',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/guojian/alarm/index.vue b/src/views/guojian/alarm/index.vue
index 442ad64..f4d19b3 100644
--- a/src/views/guojian/alarm/index.vue
+++ b/src/views/guojian/alarm/index.vue
@@ -1,10 +1,179 @@
-
- 报警数据
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.smoke }}
+ {{ scope.row.methane }}
+ {{ scope.row.divulge }}
+
+
+
+
+
+
+
+
+
- 历史记录
-
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开启
+ 关闭
+
+
+
+
+ 开启
+ 关闭
+
+
+
+
+
+
+
+
+
- 短信发送记录
-
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+