From f6363877ff1105d692ffe31bb79cd936a0ba9307 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期五, 05 八月 2022 10:00:22 +0800
Subject: [PATCH] 数据对接
---
src/views/facilityManagement/keyEquipment/index.vue | 12 +++++++-----
src/components/equipmentDailog/DailogS.vue | 12 +++++++-----
src/components/equipmentDailog/Dailog.vue | 12 +++++++-----
src/views/facilityManagement/safetyEquipment/index.vue | 12 +++++++-----
4 files changed, 28 insertions(+), 20 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,
};
},
});
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index 0851dc2..ff4fe8f 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -143,7 +143,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">
@@ -158,7 +158,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="检测结果" />
@@ -180,8 +180,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>
@@ -217,7 +217,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>
@@ -258,6 +258,7 @@
<script lang="ts">
import { defineComponent, ref } from 'vue';
import { Search, Plus, FullScreen } from '@element-plus/icons-vue';
+import {timeDate} from '/@/assets/index.ts'
import categoryDailog from './categoryDailog.vue';
import RegionsDialog from '../../views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/regionsDialog.vue';
import maintenanceDailog from './maintenanceDailog.vue';
@@ -621,6 +622,7 @@
deleteB,
deleteC,
deleteD,
+ timeDate,
};
},
});
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 720e823..52374a7 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -46,14 +46,14 @@
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
<el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
<el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
- <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
+ <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
<el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
<el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
- <el-table-column property="createTime" align="center" label="检查日期" sortable />
+ <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
<el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
@@ -61,7 +61,7 @@
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
<el-table-column property="testPersonId" align="center" label="检测人" sortable />
- <el-table-column property="testDate" align="center" label="检测日期" sortable />
+ <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
<el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
<el-table-column property="testMemo" align="center" label="检测内容" sortable />
<el-table-column property="testResult" align="center" label="检测结果" sortable />
@@ -75,8 +75,8 @@
<el-table-column property="repairMemo" align="center" label="维修情况" sortable />
<el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
<el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
- <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
- <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
+ <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
@@ -121,6 +121,7 @@
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { EditPen, Plus, Delete, Download, Refresh, Upload, View } from '@element-plus/icons-vue';
import { facilityManagementApi } from '/@/api/facilityManagement';
+import {timeDate} from '/@/assets/index.ts'
interface Tree {
label: string;
children?: Tree[];
@@ -357,6 +358,7 @@
handleSelectionChange,
onDeleteAll,
handleNodeClick,
+ timeDate,
};
},
});
diff --git a/src/views/facilityManagement/safetyEquipment/index.vue b/src/views/facilityManagement/safetyEquipment/index.vue
index 6094bf5..576cfb7 100644
--- a/src/views/facilityManagement/safetyEquipment/index.vue
+++ b/src/views/facilityManagement/safetyEquipment/index.vue
@@ -47,14 +47,14 @@
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
<el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
<el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
- <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
+ <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
<el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
<el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
- <el-table-column property="createTime" align="center" label="检查日期" sortable />
+ <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
<el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
@@ -62,7 +62,7 @@
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
<el-table-column property="testPersonId" align="center" label="检测人" sortable />
- <el-table-column property="testDate" align="center" label="检测日期" sortable />
+ <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
<el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
<el-table-column property="testMemo" align="center" label="检测内容" sortable />
<el-table-column property="testResult" align="center" label="检测结果" sortable />
@@ -76,8 +76,8 @@
<el-table-column property="repairMemo" align="center" label="维修情况" sortable />
<el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
<el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
- <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
- <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
+ <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
@@ -121,6 +121,7 @@
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
+import {timeDate} from '/@/assets/index.ts'
import { EditPen, View, Plus, Delete, Download, Refresh, Upload } from '@element-plus/icons-vue';
interface Tree {
label: string;
@@ -350,6 +351,7 @@
Refresh,
View,
Upload,
+ timeDate,
};
},
});
--
Gitblit v1.9.2