Commit 88012ac7 authored by yaqizhang's avatar yaqizhang

设备预警限时未处理

parent 144e076a
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="报警时间" prop="alarmStatus"> <el-form-item label="报警时间" prop="alarmStatus">
<el-time-picker <el-date-picker
is-range v-model="queryParams.value1"
type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始时间" start-placeholder="开始日期"
end-placeholder="结束时间" end-placeholder="结束日期">
placeholder="选择时间范围"> </el-date-picker>
</el-time-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
size="mini" size="mini"
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:alarm:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -243,6 +242,7 @@ export default { ...@@ -243,6 +242,7 @@ export default {
alarmBeginTime: null, alarmBeginTime: null,
alarmEndTime: null, alarmEndTime: null,
alarmStatus: null, alarmStatus: null,
value1: '',
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -393,18 +393,13 @@ export default { ...@@ -393,18 +393,13 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; this.$confirm('暂无数据', "警告", {
this.$confirm('是否确认导出所有报警记录数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).catch((err)=>{
this.exportLoading = true; console.log()
return exportAlarm(queryParams); });
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment