事件发生记录

src/assets/scss/common.scss

@@ -78,7 +78,9 @@ body {
     border: 1px solid var(--main-color);
     border-radius: 8px;
 }
-
+.scroll-event{
+    height: calc( 100% - 48px );
+}
 .left-wrap {
     position: absolute;
     left: calc(1vw + 1em + 48px + 20px);

src/dataSchema/scrollEventSchema.js

@@ -0,0 +1,22 @@
+/*
+ * @LastEditors: gcz
+ */
+/*
+ * @LastEditors: gcz
+ */
+/*
+ * @LastEditors: gcz
+ */
+let scrollEventSchema = {
+    header: ['日期', '地点', '类型', '上报人', '状态'],
+    data: [],
+    headerBGC: 'rgba(8,238,255,.3)',//表头背景色
+    // headerBGC:'rgba(38,80,179,1)',//表头背景色
+    // oddRowBGC:'rgba(38,80,179,.5)',//奇数行背景色
+    oddRowBGC: 'transparent',//奇数行背景色
+    evenRowBGC: 'rgba(0,175,169,.15)',//偶数行背景色	
+    align: ['center', 'center', 'center', 'center', 'center'],//列对齐方式
+    columnWidth: [95, 150],
+    rowNum: 5,//表行数	
+}
+export default scrollEventSchema

src/service/index.js

@@ -124,6 +124,13 @@ export const page6numerical = (data) =>
         prefixUrl: 'api2',
     })
 
+export const eventList = (data) =>
+    callApi({
+        url: 'event/list',
+        data,
+        prefixUrl: 'api2',
+    })
+
 // 林木结构（树种）
 export const page2numerical = (data) =>
     callApi({

src/views/index.vue

@@ -86,12 +86,22 @@
           ref="page6Char1"
           :option="page6Char1"
         />
-        <MyEcharts
+        <!-- <MyEcharts
           class="left-item chart-wrap"
           mid="page6Char2"
           ref="page6Char2"
           :option="page6Char2"
-        />
+        /> -->
+        <div class="left-item">
+          <div class="ntitle">{{$store.state.addr.selectAddr}}事件发生记录</div>
+          <dv-scroll-board
+            :key="scrollBoardKey"
+            class="scroll-event"
+            :config="scrollEventConfig"
+            ref="scrollBoard"
+          />
+
+        </div>
       </section>
 
       <section class="right-wrap">
@@ -169,6 +179,7 @@ import {
   page6numerical,
   page6echarts01,
   page6echarts02,
+  eventList,
   smallClassDetail
 } from '../service/index';
 
@@ -183,6 +194,7 @@ import page5Char1Schema from '../dataSchema/page5Char1Schema';
 import page5Char2Schema from '../dataSchema/page5Char2Schema';
 import page6Char1Schema from '../dataSchema/page6Char1Schema';
 import page6Char2Schema from '../dataSchema/page6Char2Schema';
+import scrollEventSchema from '../dataSchema/scrollEventSchema';
 
 
 //柱状图颜色
@@ -245,6 +257,7 @@ export default {
       page6numerical: [],
       page6Char1: page6Char1Schema,
       page6Char2: page6Char2Schema,
+      scrollEventConfig:scrollEventSchema,
       xiaobaninput: '',
       baseinput:''
     };
@@ -380,9 +393,10 @@ export default {
       } else if (this.$store.state.addr.page == 'event') {
         this.getPage6numerical();
         this.getPage6echarts01();
-        this.getPage6echarts02();
+        this.getEventList();
+        // this.getPage6echarts02();
         this.getAlarmData();
-        this.getRightScrollData();
+        // this.getRightScrollData();
       }
     },
     getPage1numerical() {
@@ -518,15 +532,51 @@ export default {
             ]);
           });
           this.scrollBoardKey = Date.now();
-          // this.$refs.scrollBaseList.updateRows(this.scrollBaseListConfig.data);
-
-          // console.log('this.scrollBoardConfig.data', this.scrollBoardConfig.data);
-          // this.scrollBoardConfig = res.data;
         })
         .catch((err) => {
           console.log('echarts01 err', err);
         });
     },
+    getEventList(){
+      let param = {
+        cityId: this.$store.state.addr.selectCity.areaId,
+        countyId: this.$store.state.addr.selectDistrict.areaId,
+        townId: this.$store.state.addr.selectStreet.areaId
+      };
+      eventList(param)
+        .then((res) => {
+          this.scrollEventConfig.data = [];
+          res.rows.forEach((element) => {
+            this.scrollEventConfig.data.push([
+              element.createTime.slice(5,16),
+              element.townName+element.villageName,
+              this.eventTypeFilter(element.eventType),
+              element.createBy,
+              this.eventStateFilter(element.state),
+            ]);
+          });
+          this.scrollBoardKey = Date.now();
+        })
+        .catch((err) => {
+          console.log('getEventList err', err);
+        });
+    },
+    eventTypeFilter(e){
+      if(e=='1'){
+        return '火灾'
+      }else if(e=='2'){
+        return '砍伐'
+      }else if(e=='3'){
+        return '病虫害'
+      }
+    },
+    eventStateFilter(e){
+      if(e=='0'){
+        return '未反馈'
+      }else if(e=='1'){
+        return '已反馈'
+      }
+    },
     getAlarmData() {
       alarmDataApi()
         .then((res) => {