|
|
|
|
@ -190,12 +190,12 @@
|
|
|
|
|
<!-- <dict-tag :options="dict.type.dms_notice_status" :value="scope.row.noticeStatus"/>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<el-table-column label="报警开始时间" align="center" prop="alarmBeginTime" width="180" v-if="columns[3].visible">
|
|
|
|
|
<el-table-column label="报警开始时间" align="center" prop="alarmBeginTime" width="200" v-if="columns[3].visible">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span>{{ parseTime(scope.row.alarmBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="报警结束时间" align="center" prop="alarmEndTime" width="180" v-if="columns[4].visible">
|
|
|
|
|
<el-table-column label="报警结束时间" align="center" prop="alarmEndTime" width="200" v-if="columns[4].visible">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span>{{ parseTime(scope.row.alarmEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
@ -250,20 +250,12 @@
|
|
|
|
|
<!-- <el-input v-model="form.alarmRuleId" placeholder="请输入设备报警规则id"/>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<el-form-item label="报警开始时间" prop="alarmBeginTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="form.alarmBeginTime"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format=" yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
disabled>
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
<el-date-picker clearable v-model="form.alarmBeginTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
placeholder="请选择报警开始时间" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="报警结束时间" prop="alarmEndTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="form.alarmEndTime"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format=" yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
disabled>
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
<el-date-picker clearable v-model="form.alarmEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
placeholder="请选择报警结束时间" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<!-- <el-form-item label="报警持续时间(ms)" prop="continueTime">-->
|
|
|
|
|
<!-- <el-input v-model="form.continueTime" placeholder="请输入报警持续时间(ms)"/>-->
|
|
|
|
|
|