diff --git a/src/api/equipmentManagement/devicegroup/index.ts b/src/api/equipmentManagement/devicegroup/index.ts index 42d9216..8dd2629 100644 --- a/src/api/equipmentManagement/devicegroup/index.ts +++ b/src/api/equipmentManagement/devicegroup/index.ts @@ -40,7 +40,7 @@ function getTreeData(para: any) { return new Promise((resolve, reject) => { Promise.allSettled([promise2]).then(res => { - debugger; + if (res[0].status == 'fulfilled') { let json = res[0].value; @@ -370,7 +370,7 @@ function getNodeDevice(para) { Promise.allSettled([promise2]).then(res => { if (res[0].status == 'fulfilled') { - debugger; + resolve(res[0].value); } }); diff --git a/src/api/equipmentManagement/repairRecords/index.ts b/src/api/equipmentManagement/repairRecords/index.ts new file mode 100644 index 0000000..60604f5 --- /dev/null +++ b/src/api/equipmentManagement/repairRecords/index.ts @@ -0,0 +1,137 @@ +import request from '@/utils/request'; + +//修改设备维修记录 +function updateRepair(data) { + return request({ + url: '/equipment/repairRecords', + method: 'put', + data:data + // data: { + // "recordId": data.recordId, + // "deviceId": data.deviceId, + // "createTime": data.createTime, + // "updateTime": data.updateTime, + // "repairTime": data.repairTime, + // "repairPart": data.repairPart, + // "repairReason": data.repairReason, + // "repairPerson": data.repairPerson, + // // "beforeFile": data.beforeFile, + // // "afterFile": data.afterFile + // } + }); + +} + + + +//新增设备维修记录 +function addRepir(data) { + return request({ + url: '/equipment/repairRecords', + method: 'post', + data:data + // data: { + // "recordId": data.recordId, + // "deviceId": data.deviceId, + // "createTime": data.createTime, + // "updateTime": data.updateTime, + // "repairTime": data.repairTime, + // "repairPart": data.repairPart, + // "repairReason": data.repairReason, + // "repairPerson": data.repairPerson, + // // "beforeFile": data.beforeFile, + // // "afterFile": data.afterFile + // } + }); + +} + + +//导出设备维修记录 +function exportRepir(data) { + return request({ + url: '/equipment/repairRecords/export', + method: 'post', + data: { + "recordId": data.recordId, + "deviceId": data.deviceId, + "createTime": data.createTime, + "updateTime": data.updateTime, + "repairTime": data.repairTime, + "repairPart": data.repairPart, + "repairReason": data.repairReason, + "repairPerson": data.repairPerson + } + }); + +} + + +//获取明细设备维修记录 +function getRepirDetail(id) { + return request({ + url: '/equipment/repairRecords/' + id, + method: 'get' + }); + +} + + + +//获取列表 +function getRepairList(data) { + return request({ + url: '/equipment/repairRecords/list', + method: 'get', + params: { + "recordId": data.recordId, + "deviceId": data.deviceId, + "repairPart": data.repairPart, + "repairReason": data.repairReason, + "repairPerson": data.repairPerson, + "repairBeginTime": data.repairBeginTime, + "repairEndTime": data.repairBeginTime, + "pageNum": data.pageNum, + "pageSize": data.pageSize + } + }); + +} + +//删除记录 +function dropRepir(id) { + if (Array.isArray(id)) { + id = id.join(","); + } + return request({ + url: '/equipment/repairRecords/' + id, + method: 'delete' + }); + +} + + +//获取设备类型 +function getDeviceTypeAll() { + return new Promise((resolve, reject) => { + request({ + url: '/api/deviceType/all', + method: 'get', + + }).then((res) => { + resolve(res); + }).catch((ex) => { + reject(ex); + }); + }); +} + +export default { + updateRepair: updateRepair, + addRepir: addRepir, + exportRepir: exportRepir, + getRepirDetail: getRepirDetail, + getRepairList: getRepairList, + dropRepir: dropRepir, + getDeviceTypeAll: getDeviceTypeAll +} \ No newline at end of file diff --git a/src/utils/common.ts b/src/utils/common.ts new file mode 100644 index 0000000..1e728f2 --- /dev/null +++ b/src/utils/common.ts @@ -0,0 +1,46 @@ +function DateFormat(date, format) { + if (!date) { + date = new Date(); + } + if (!format) { + format = 'yyyy-MM-dd HH:mm:ss'; + } + // 处理参数默认值 + if (typeof date === 'string' || typeof date === 'number') { + date = new Date(date); + } + date = date instanceof Date ? date : new Date(); + format = format || 'yyyy-MM-dd'; + + // 检查日期是否有效 + if (isNaN(date.getTime())) { + return 'Invalid Date'; + } + + // 定义格式化映射 + const formatMap = { + 'yyyy': date.getFullYear(), + 'MM': String(date.getMonth() + 1).padStart(2, '0'), + 'dd': String(date.getDate()).padStart(2, '0'), + 'HH': String(date.getHours()).padStart(2, '0'), + 'mm': String(date.getMinutes()).padStart(2, '0'), + 'ss': String(date.getSeconds()).padStart(2, '0'), + 'SSS': String(date.getMilliseconds()).padStart(3, '0'), + 'M': date.getMonth() + 1, + 'd': date.getDate(), + 'H': date.getHours(), + 'm': date.getMinutes(), + 's': date.getSeconds(), + 'S': date.getMilliseconds() + }; + + // 替换格式字符串中的占位符 + return format.replace(/(yyyy|MM|dd|HH|mm|ss|SSS|M|d|H|m|s|S)/g, (match) => { + return formatMap[match]; + }); +} + + +export default{ +DateFormat:DateFormat +} \ No newline at end of file diff --git a/src/utils/request.ts b/src/utils/request.ts index e7b87c3..89622de 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -34,6 +34,7 @@ const service = axios.create({ // 请求拦截器 service.interceptors.request.use( (config: InternalAxiosRequestConfig) => { + // 对应国际化资源文件后缀 config.headers['Content-Language'] = getLanguage(); diff --git a/src/views/equipmentManagement/repairRecords/index.vue b/src/views/equipmentManagement/repairRecords/index.vue new file mode 100644 index 0000000..42a7cf5 --- /dev/null +++ b/src/views/equipmentManagement/repairRecords/index.vue @@ -0,0 +1,1048 @@ + + + + + + diff --git a/src/views/fys-equipment/group/index.vue b/src/views/fys-equipment/group/index.vue index 99b96ec..35f1f32 100644 --- a/src/views/fys-equipment/group/index.vue +++ b/src/views/fys-equipment/group/index.vue @@ -1,5 +1,5 @@