修改

src/views/alarm/alarmRecords/index.vue

@@ -161,13 +161,14 @@
             </el-tooltip>
         </template>
       </el-table-column> -->
-      <el-table-column prop="device_number" align="center" label="设备编号" />
-      <el-table-column prop="device_name" align="center" label="设备名称" />
-      <el-table-column prop="reason_text" align="center" label="告警原因 "/>
-      <el-table-column prop="start_time_text" align="center" label="告警开始时间" />
-      <el-table-column prop="end_time_text" align="center" label="告警结束时间" />
+      <el-table-column prop="device_number" align="center" sortable label="设备编号" />
+      <el-table-column prop="device_name" align="center" sortable label="设备名称" />
+      <el-table-column prop="alarm_type" align="center"  sortable label="告警类型 "/>
+      <el-table-column prop="reason_text" align="center" sortable  label="告警原因 "/>
+      <el-table-column prop="start_time_text" align="center" sortable label="告警开始时间" />
+      <!-- <el-table-column prop="end_time_text" align="center" width="160" label="告警结束时间" /> -->
       <!-- <el-table-column prop="state" align="center" label="告警状态" /> -->
-      <el-table-column prop="comment" align="center" label="备注" />
+      <el-table-column prop="comment" align="center" min-width="180" label="备注" />
       <el-table-column label="操作" width="130" align="center">
         <template slot-scope="record">
   

src/views/alarm/alarmReport/index.vue

@@ -154,7 +154,7 @@ export default {
     // })
     this.alarmReasonList=this.$appConfig["alarmReasonList"];
    
-    this.$http.post("sysDictData/getOptions", { type: "AlarmType" }).then(resp => {
+    this.$http.post("sysDictData/getOptions", { type: "AlarmReason" }).then(resp => {
         this.alarmTypeOptions = resp.data;
     })
   }

src/views/alarm/pushResult/index.vue

@@ -3,6 +3,21 @@
     <div class="filter-container">
        <el-input v-model="queryParam.username" placeholder="推送用户" clearable class="filter-item fl form-search-input" />
       <el-input v-model="queryParam.device_number" placeholder="设备号" clearable class="filter-item fl form-search-input" />
+      <el-select
+            class="filter-item fl form-search-input"
+            v-model="queryParam.alarm_reason"
+            clearable
+            multiple
+            placeholder="告警原因"
+            @change="handleSearchAlarm"
+          >
+            <el-option
+              v-for="item in alarmReasons"
+              :key="item.value"
+              :label="item.text"
+              :value="item.value"
+            ></el-option>
+          </el-select>
       <el-button class="filter-item fl search" icon="el-icon-search" @click="handleSearch">
         搜索
       </el-button>
@@ -18,13 +33,13 @@
     <el-table ref="multipleTable"  v-loading="loading" :data="data" tooltip-effect="dark" style="width: 100%" border fit @selection-change="handleSelectMulti">
       <!-- <el-table-column type="selection" width="55" align="center"/> -->
       <el-table-column prop="username" label="推送用户" align="center"/>
-      <el-table-column prop="device_number" label="设备编号" align="center"/>
-      <el-table-column prop="alarm_type_name" label="告警类型" align="center">
+      <el-table-column prop="device_number" sortable label="设备编号" align="center"/>
+      <el-table-column prop="alarm_type_name"  label="告警类型" align="center">
           <template slot-scope="scope">
             <el-tag  effect="dark" :color='alarmReasonList[scope.row.alarm_type]'>{{scope.row.alarm_type_name}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column prop="created_at" label="推送时间" align="center"/>
+      <el-table-column prop="created_at" sortable label="推送时间" align="center"/>
       <el-table-column prop="result" label="推送结果" align="center"/>
       <!-- <el-table-column label="操作" align="center" width="100">
         <template slot-scope="record">
@@ -58,12 +73,15 @@ export default {
           username:''
       },
       alarmReasonList:[],
+       alarmReasons: [],
       
     }
   },
   mounted(){
     this.alarmReasonList=this.$appConfig["alarmReasonList"];
-   
+          this.$http .post("sysDictData/getOptions", { type: "AlarmReason" }) .then((resp) => {
+          this.alarmReasons = resp.data;
+      });
   },
   methods: {
    

src/views/alarm/search/Searchbar.vue

@@ -26,7 +26,7 @@
           <el-cascader
             class="filter-item fl"
             @change="selectDepart"
-            placeholder="请选择所属单位"
+            placeholder="请选择所属部门"
             :options="departments"
             v-model="checkedDepart"
             :props="departProps"
@@ -53,6 +53,23 @@
             ></el-option>
           </el-select>
         </el-col>
+        <el-col :md="4">
+          <el-select
+            class="filter-item fl"
+            v-model="queryParam.alarm_type"
+            clearable
+            multiple
+            placeholder="告警类型"
+            @change="handleSearchAlarm"
+          >
+            <el-option
+              v-for="item in alarmTypes"
+              :key="item.value"
+              :label="item.text"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-col>
         <el-col :md="12">
           <el-date-picker
             v-model="queryParam.start_time"
@@ -103,6 +120,7 @@ export default {
     this.getDeviceTypeOptions();
     // 获取告警原因选项
     this.getAlarmReasonOptions();
+    this.getAlarmTypeOptions();
     // 获取设备状态选项
     this.deviceStatus = this.$appConfig.deviceState_copy;
     // 获取所属单位
@@ -147,6 +165,7 @@ export default {
       alarmState: [],
       deviceTypes: [],
       alarmReasons: [],
+      alarmTypes:[],
       deviceStatus: {},
       departments: [],
       pickerOptions: {
@@ -260,11 +279,17 @@ export default {
      * 获取告警原因
      */
     getAlarmReasonOptions() {
-      this.$http
-        .post("sysDictData/getOptions", { type: "AlarmReason" })
-        .then((resp) => {
+      this.$http .post("sysDictData/getOptions", { type: "AlarmReason" }) .then((resp) => {
           this.alarmReasons = resp.data;
-        });
+      });
+    },
+    /**
+     * 获取告警类型
+     */
+    getAlarmTypeOptions() {
+      this.$http .post("sysDictData/getOptions", { type: "AlarmType" }) .then((resp) => {
+          this.alarmTypes = resp.data;
+      });
     },
     selectDepart(val) {
       this.queryParam.depart_id = val ? val[val.length - 1] : "";

src/views/report/windCount/index.vue

@@ -140,7 +140,7 @@ export default {
     getBarOptions(){
           return {
             title: {
-              text: "风场液压泵统计",
+              text: "风场设备统计",
               textStyle: {
                 color: '#80a0b0',
                 fontSize: 16,
@@ -148,7 +148,7 @@ export default {
               }
             },
             legend: {
-              show: false //不显示 柱形名称
+              show: true //不显示 柱形名称
             },
             xAxis: {
                 data: this.barXData
@@ -167,6 +167,13 @@ export default {
             ],
             series: [
               {
+                name: "风机",
+                type: "bar",
+                barMaxWidth: '40',
+                data: this.barSeriesData,
+               
+              },
+              {
                 name: "液压泵",
                 type: "bar",
                 barMaxWidth: '40',