告警信息

accessControlSystem/src/views/alarmInformation/index.vue

@@ -12,7 +12,7 @@
                 ></el-input>
                 <el-date-picker
                     v-model="pickerTime"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd hh:mm:ss"
                     type="daterange"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -69,46 +69,46 @@ export default {
                 },
                 {
                     label: '设备编号',
-                    prop: 'communityName'
+                    prop: 'deviceNo'
                 },
                 {
                     label: '设备名称',
-                    prop: 'communityName'
+                    prop: 'deviceName'
                 },
                 {
                     label: '门禁机类型',
-                    prop: 'householdType',
+                    prop: 'gateType',
                     format(val) {
                         if (val == 1) {
-                            return '业主';
+                            return '围墙机';
                         } else if (val == 2) {
-                            return '亲属';
-                        } else if (val == 3) {
-                            return '租客';
+                            return '单元机';
                         }
                     }
                 },
                 {
                     label: '告警类型',
-                    prop: 'householdType',
+                    prop: 'alarmType',
                     format(val) {
-                        if (val == 1) {
-                            return '业主';
-                        } else if (val == 2) {
-                            return '亲属';
-                        } else if (val == 3) {
-                            return '租客';
+                        if (val == 501) {
+                            return '消防报警';
+                        } else if (val == 601) {
+                            return '非法进入报警';
+                        } else if (val == 701) {
+                            return '防拆报警';
+                        } else if (val == 801) {
+                            return '门长开报警';
                         }
                     }
                 },
 
                 {
                     label: '告警时间',
-                    prop: 'roomNumber'
+                    prop: 'createDate'
                 },
                 {
                     label: '设备地址',
-                    prop: 'roomNumber'
+                    prop: 'address'
                 }
             ],
             mixins_post: 'get'
@@ -116,7 +116,8 @@ export default {
     },
     methods: {
         currentOrganId(data) {
-            this.currentId = data.id || '';
+            this.mixins_query.communityId = data.id || '';
+            this.mixins_search();
         },
         timeToggle(e) {
             let start = '00:00:00',
@@ -132,10 +133,7 @@ export default {
     },
 
     created() {
-        this.mixins_dataUrl = '/sc-community/scResident/page'; // 分页查询接口
-        this.mixins_query = {
-            questParams: ''
-        };
+        this.mixins_dataUrl = '/sc-gate-web/alarm/page'; // 分页查询接口
         this.mixins_search();
     }
 };

operationSupport/src/views/newWorkBench/index.vue

@@ -0,0 +1,18 @@
+<template>
+    <div class="workbench"></div>
+</template>
+        
+<script>
+export default {};
+</script>
+<style lang="scss" scoped>
+@import '@assets/css/public-style.scss';
+.workbench {
+    background: #2c354a;
+    height: 100%;
+    .list_1x2 {
+        width: calc(100% - #{rem(60)});
+    }
+}
+</style>
+