From f6363877ff1105d692ffe31bb79cd936a0ba9307 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期五, 05 八月 2022 10:00:22 +0800
Subject: [PATCH] 数据对接

---
 src/components/equipmentDailog/Dailog.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index 3031556..249d42e 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -230,7 +230,7 @@
 				<el-table :data="form.takecareDetailList" style="width: 100%">
 					<el-table-column align="center" prop="takecareMemo" label="保养情况" />
 					<el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
-					<el-table-column align="center" prop="takecareDate" label="保养日期" />
+					<el-table-column align="center" prop="takecareDate" :formatter="timeDate" label="保养日期" />
 					<el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
 					<el-table-column align="center" label="操作">
 						<template #default="scope">
@@ -245,7 +245,7 @@
 				<el-button type="primary" size="default" @click="openDetect('新增', '')">新增</el-button>
 				<el-table :data="form.testDetailList" style="width: 100%">
 					<el-table-column align="center" prop="testPersonId" label="检测人" />
-					<el-table-column align="center" prop="testDate" label="检测日期" />
+					<el-table-column align="center" prop="testDate" :formatter="timeDate" label="检测日期" />
 					<el-table-column align="center" prop="testPersonDepartmentId" label="检测人单位" />
 					<el-table-column align="center" prop="testMemo" label="检测内容" />
 					<el-table-column align="center" prop="testResult" label="检测结果" />
@@ -267,8 +267,8 @@
 					<el-table-column align="center" prop="repairMemo" label="维修情况" />
 					<el-table-column align="center" prop="repairPersonId" label="维修负责人" />
 					<el-table-column align="center" prop="repairPersonDepartmentId" label="维修负责人单位" />
-					<el-table-column align="center" prop="repairStartDate" label="维修开始日期" />
-					<el-table-column align="center" prop="repairEndDate" label="维修结束日期" />
+					<el-table-column align="center" prop="repairStartDate" :formatter="timeDate" label="维修开始日期" />
+					<el-table-column align="center" prop="repairEndDate" :formatter="timeDate" label="维修结束日期" />
 					<el-table-column align="center" label="操作">
 						<template #default="scope">
 							<el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
@@ -303,7 +303,7 @@
 					<el-table-column align="center" sortable prop="address" label="任务名称" />
 					<el-table-column align="center" sortable prop="address" label="点位类型" />
 					<el-table-column align="center" sortable prop="address" label="检查频次" />
-					<el-table-column align="center" sortable prop="address" label="巡检时间" />
+					<el-table-column align="center" sortable prop="address" :formatter="timeDate" label="巡检时间" />
 					<el-table-column align="center" sortable prop="address" label="巡检人" />
 				</el-table>
 			</el-tab-pane>
@@ -349,6 +349,7 @@
 import maintenanceDailog from './maintenanceDailog.vue';
 import detectDailog from './detectDailog.vue';
 import repairDailog from './repairDailog.vue';
+import {timeDate} from '/@/assets/index.ts'
 import standardDailog from './standardDailog.vue';
 import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -977,6 +978,7 @@
 			full,
 			toggleFullscreen,
 			FullScreen,
+      timeDate,
 		};
 	},
 });

--
Gitblit v1.9.2