合并develop最新代码

src/views/ems/dzjk/gzgj/index.vue

@@ -3,9 +3,9 @@
   <div  v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
-      <el-form-item label="设备类型">
-        <el-select v-model="search.deviceType" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-          <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
+      <el-form-item label="设备清单">
+        <el-select v-model="search.deviceId" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.deviceName" :value="item.deviceId" v-for="(item,key) in deviceOptions" :key="key+'deviceIdOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级">
@@ -114,6 +114,7 @@
 
 <script>
 import {getAlarmDetailList} from'@/api/ems/dzjk'
+import {getDeviceList} from'@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { formatDate } from '@/filters/ems'
 export default {
@@ -126,6 +127,7 @@ export default {
         {name:'今日告警',id:'today'},
         {name:'历史告警',id:'history'},
       ],
+      deviceOptions:[],//设备列表
       pickerOptions:{
         disabledDate(time) {
           return time.getTime() > Date.now();
@@ -134,7 +136,7 @@ export default {
       defaultDateRange:[],//默认展示的时间
       dateRange:[],//alarmStartTime,alarmEndTime
       activeBtn:'today',
-      search:{deviceType:'',alarmLevel:''},
+      search:{deviceId:'',alarmLevel:''},
       // 表格、分页
       tableData:[],
       pageSize:10,//分页栏当前每个数据总数
@@ -186,7 +188,7 @@ export default {
     },
     // 重置
     onReset(){
-      this.search={deviceType:'',alarmLevel:''}
+      this.search={deviceId:'',alarmLevel:''}
       this.dateRange=[]
       this.pageNum =1//每次搜索从1开始搜索
       this.getData()
@@ -213,7 +215,7 @@ export default {
     // 获取数据
     getData(){
       this.loading=true
-      const {deviceType,alarmLevel} = this.search
+      const {deviceId,alarmLevel} = this.search
       const {siteId,pageNum,pageSize,activeBtn} =this
       const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       let start='',end = '',now =new Date()
@@ -230,12 +232,18 @@ export default {
           // end.setDate(end.getDate() - 1);
         }
       }
-      getAlarmDetailList({deviceType,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(start),alarmEndTime:formatDate(end)}).then(response => {
+      getAlarmDetailList({deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(start),alarmEndTime:formatDate(end)}).then(response => {
         this.tableData=response?.rows || [];
         this.totalSize = response?.total || 0
       }).finally(() => {this.loading=false})
     },
+    getDeviceOptions(){
+      getDeviceList(this.siteId).then(response => {
+        this.deviceOptions = JSON.parse(JSON.stringify(response?.data || []))
+      })
+    },
     init(){
+      this.getDeviceOptions()
       this.onReset()
     },
   },