+ 告警列表

ems-ui/src/views/alarm/alarm-info/index.vue

@@ -54,12 +54,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="告警状态" prop="alarmState">
-        <el-input
-            v-model="queryParams.alarmState"
-            placeholder="请输入告警状态"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.alarmState" placeholder="请选择告警状态">
+          <el-option
+              v-for="dict in dict.type.alarm_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -134,7 +136,7 @@
       </el-table-column>
       <el-table-column label="告警时间" align="center" prop="alarmTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.alarmTime, '{hh}:{mm}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="告警代码" align="center" prop="alarmCode" />
@@ -198,20 +200,16 @@
         <el-form-item label="对象代码" prop="objCode">
           <el-input v-model="form.objCode" placeholder="请输入对象代码" />
         </el-form-item>
-        <el-form-item label="告警日期" prop="alarmDate">
-          <el-date-picker clearable
-                          v-model="form.alarmDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择告警日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="告警时间" prop="alarmTime">
-          <el-date-picker clearable
-                          v-model="form.alarmTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择告警时间">
+          <el-date-picker
+              v-model="form.alarmTime"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd HH:mm:00"
+              :style="{width: '100%'}"
+              placeholder="请选择告警时间"
+              @change="dateChange" clearable
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="告警代码" prop="alarmCode">
@@ -231,7 +229,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="告警状态" prop="alarmState">
-          <el-input v-model="form.alarmState" placeholder="请输入告警状态" />
+          <el-select v-model="form.alarmState" placeholder="请选择告警状态">
+            <el-option
+                v-for="dict in dict.type.alarm_state"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -244,10 +249,11 @@
 
 <script>
 import { addAlarmInfo, delAlarmInfo, getAlarmInfo, listAlarmInfo, updateAlarmInfo } from '@/api/alarm/alarm-info';
+import dayjs from 'dayjs';
 
 export default {
   name: 'Alarm-info',
-  dicts: ['obj_type', 'alarm_type'],
+  dicts: ['obj_type', 'alarm_type', 'alarm_state'],
   data() {
     return {
       // 遮罩层
@@ -305,13 +311,6 @@ export default {
             trigger: 'blur',
           },
         ],
-        alarmDate: [
-          {
-            required: true,
-            message: '告警日期不能为空',
-            trigger: 'blur',
-          },
-        ],
         alarmTime: [
           {
             required: true,
@@ -361,7 +360,6 @@ export default {
         areaCode: null,
         objType: null,
         objCode: null,
-        alarmDate: null,
         alarmTime: null,
         alarmCode: null,
         alarmMsg: null,
@@ -370,6 +368,11 @@ export default {
       };
       this.resetForm('form');
     },
+    dateChange(val) {
+      this.$refs.form.alarmTime = val;
+      this.$refs.form.alarmDate = dayjs(val).format('YYYY-MM-DD');
+      this.form.alarmDate = dayjs(val).format('YYYY-MM-DD');
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -407,6 +410,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            debugger
             updateAlarmInfo(this.form).then(response => {
               this.$modal.msgSuccess('修改成功');
               this.open = false;