update

src/views/report/kiln-alarm.vue

@@ -1,23 +1,20 @@
 <template>
-  <div class="mod-log">
-    <el-form
-      :inline="true"
-      :model="dataForm"
-      @keyup.enter.native="getDataList()"
-    >
+  <div class="mod-config">
+    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-select v-model="dataForm.key" filterable placeholder="窑炉名称">
+        <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="窑炉名称">
           <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in kilnList"
+            :key="item.id"
+            :label="item.kilnName"
+            :value="item.id"
           >
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-date-picker
+          size="small"
           v-model="dataForm.time"
           value-format="yyyy-MM-dd"
           type="daterange"
@@ -26,14 +23,15 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      border
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%"
     >
@@ -46,30 +44,22 @@
       >
       </el-table-column>
       <el-table-column
-        prop="username"
-        header-align="center"
-        align="center"
+        prop="equipmentName"
         label="窑炉名称"
       >
       </el-table-column>
       <el-table-column
-        prop="operation"
-        header-align="center"
-        align="center"
+        prop="createTime"
         label="报警时间"
       >
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="time"
-        header-align="center"
-        align="center"
         label="报警级别"
-      >
+      > -->
       </el-table-column>
       <el-table-column
-        prop="ip"
-        header-align="center"
-        align="center"
+        prop="alarmInfo"
         label="报警内容"
       >
       </el-table-column>
@@ -92,8 +82,7 @@ export default {
   data () {
     return {
       dataForm: {
-        key: '',
-        time: []
+        equipmentId: null
       },
       dataList: [],
       options: [],
@@ -101,28 +90,49 @@ export default {
       pageSize: 10,
       totalPage: 0,
       dataListLoading: false,
-      selectionDataList: []
+      selectionDataList: [],
+      kilnList: []
     }
   },
   created () {
-    this.getDataList()
+    this.getKilnList()
   },
   methods: {
+    // 获取窑炉列表
+    getKilnList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/kilnInfo/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: 1,
+          size: 999
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.kilnList = data.data.records
+          this.getDataList()
+        } else {
+          this.kilnList = []
+        }
+      })
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
       this.$http({
-        url: this.$http.adornUrl('/sys/log/list'),
-        method: 'get',
-        params: this.$http.adornParams({
-          page: this.pageIndex,
-          limit: this.pageSize,
-          key: this.dataForm.key
+        url: this.$http.adornUrl('/alarmInfo/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: this.pageIndex,
+          size: this.pageSize,
+          type: 0,
+          equipmentId: this.dataForm.equipmentId
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
-          this.dataList = data.page.list
-          this.totalPage = data.page.totalCount
+          this.dataList = data.data.records
+          this.totalPage = data.data.total
         } else {
           this.dataList = []
           this.totalPage = 0