From d9123d3e5fcc572284fedc7af67de07bb697a092 Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期一, 16 五月 2022 15:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 34e3041..9586da1 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -119,11 +119,11 @@
</el-table-column>
<el-table-column label="巡检人" prop="execUname" align="center">
</el-table-column>
- <el-table-column label="巡检开始时间" prop="execUname" align="center">
+ <el-table-column label="巡检开始时间" prop="expTime" align="center">
</el-table-column>
- <el-table-column label="巡检结束时间" prop="execUname" align="center">
+ <el-table-column label="巡检结束时间" prop="endTime" align="center">
</el-table-column>
- <el-table-column label="巡检提交时间" prop="execUname" align="center">
+ <el-table-column label="巡检提交时间" prop="execTime" align="center">
</el-table-column>
<el-table-column label="任务状态" prop="status" align="center">
<template slot-scope="scope">
--
Gitblit v1.9.2