|
@@ -69,9 +69,9 @@
|
|
|
<el-table v-loading="loading" :data="pressureList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="裂解炉名称" align="center" prop="furnanceName" :show-overflow-tooltip="true" width="100"/>
|
|
|
- <el-table-column label="巡检日期" align="center" prop="recordTime" width="100">
|
|
|
+ <el-table-column label="巡检日期" align="center" prop="recordTime" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d}') }}</span>
|
|
|
+ <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="班组" align="center" prop="team" :show-overflow-tooltip="true" width="80" :formatter="teamFormat"/>
|
|
@@ -302,14 +302,24 @@
|
|
|
<el-form-item label="裂解炉名称" prop="furnanceName">
|
|
|
<el-input v-model="form.furnanceName" placeholder="请输入裂解炉名称" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="巡检日期" prop="recordTime">
|
|
|
+ <el-form-item label="巡检日期" prop="recordTimeYmd">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="form.recordTime"
|
|
|
+ v-model="recordTimeYmd"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择巡检日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="巡检时间" prop="recordTimeHms">
|
|
|
+ <el-time-picker
|
|
|
+ v-model="recordTimeHms"
|
|
|
+ :picker-options="{selectableRange: '00:00:01 - 23:59:59'}"
|
|
|
+ placeholder="请选择时间"
|
|
|
+ value-format="HH:mm:ss"
|
|
|
+ size="small"
|
|
|
+ style="width: 200px">
|
|
|
+ </el-time-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="班组">
|
|
|
<el-select v-model="form.team" placeholder="请选择" size="small">
|
|
|
<el-option
|
|
@@ -601,6 +611,8 @@
|
|
|
statusOptions: [],
|
|
|
// 班组字典
|
|
|
teamOptions: [],
|
|
|
+ recordTimeYmd: null,
|
|
|
+ recordTimeHms: null,
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
@@ -787,6 +799,9 @@
|
|
|
const id = row.id || this.ids
|
|
|
getPressure(id).then(response => {
|
|
|
this.form = response.data;
|
|
|
+ let recordTime = new Date(this.form.recordTime);
|
|
|
+ this.recordTimeYmd = recordTime.getFullYear() + "-" + (recordTime.getMonth() + 1) + "-" + recordTime.getDate();
|
|
|
+ this.recordTimeHms = recordTime.getHours() + ":" + recordTime.getMinutes() + ":" + recordTime.getSeconds();
|
|
|
if (response.data.pass1 == null) { this.pass1 = []; } else { this.pass1 = response.data.pass1.split(','); }
|
|
|
if (response.data.pass2 == null) { this.pass2 = []; } else { this.pass2 = response.data.pass2.split(','); }
|
|
|
if (response.data.pass3 == null) { this.pass3 = []; } else { this.pass3 = response.data.pass3.split(','); }
|
|
@@ -825,6 +840,7 @@
|
|
|
this.form.pass14 = this.pass14.join(",");
|
|
|
this.form.pass15 = this.pass15.join(",");
|
|
|
this.form.pass16 = this.pass16.join(",");
|
|
|
+ this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != null) {
|