Merge remote-tracking branch 'origin/master'

danger-manage-system/src/main/java/com/zehong/system/service/impl/TBreakRulesPersonRecordServiceImpl.java

 package com.zehong.system.service.impl;
 
+import java.sql.Time;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +54,9 @@ public class TBreakRulesPersonRecordServiceImpl implements ITBreakRulesPersonRec
     @Override
     public int insertTBreakRulesPersonRecord(TBreakRulesPersonRecord tBreakRulesPersonRecord)
     {
+        if(tBreakRulesPersonRecord.getReportTime()==null){
+            tBreakRulesPersonRecord.setReportTime(new Date());
+        }
         return tBreakRulesPersonRecordMapper.insertTBreakRulesPersonRecord(tBreakRulesPersonRecord);
     }
 

danger-manage-web/src/views/system/limitTime/limitTime.vue

@@ -30,15 +30,14 @@
                 <el-option label="手动消警" value="2" />
               </el-select>
             </el-form-item> -->
-            <el-form-item label="报警时间" prop="alarmStatus">
-                <el-time-picker
-                    is-range
-                    v-model="queryParams.alarmStatus"
+            <el-form-item label="报警时间" prop="value1">
+              <el-date-picker
+                v-model="queryParams.value1"
+                type="daterange"
                 range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                    placeholder="选择时间范围">
-                </el-time-picker>
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+            </el-date-picker>
             </el-form-item>
             
             <el-form-item>
@@ -56,7 +55,6 @@
                 size="mini"
                 :loading="exportLoading"
                 @click="handleExport"
-                v-hasPermi="['system:alarm:export']"
               >导出</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -244,6 +242,7 @@ export default {
         alarmBeginTime: null,
         alarmEndTime: null,
         alarmStatus: null,
+        value1: '',
       },
       // 表单参数
       form: {},
@@ -294,6 +293,7 @@ export default {
         alarmBeginTime: null,
         alarmEndTime: null,
         alarmStatus: "0",
+        value1: '',
         alarmImageUrl: null,
         alarmVaule: null,
         createBy: null,
@@ -301,7 +301,8 @@ export default {
         updateBy: null,
         updateTime: null,
         isDel: null,
-        remarks: null
+        remarks: null,
+        value1: '',
       };
       this.resetForm("form");
     },
@@ -394,18 +395,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有报警记录数据项?', "警告", {
+        this.$confirm('暂无数据', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportAlarm(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        }).catch((err)=>{
+          console.log()
+        });
     }
   }
 };