diff --git a/src/api/equiptManagement/maintenancetools.js b/src/api/equiptManagement/maintenancetools.js new file mode 100644 index 0000000..c958855 --- /dev/null +++ b/src/api/equiptManagement/maintenancetools.js @@ -0,0 +1,38 @@ +// 量具保养 +import request from '@/axios'; + +// 量具保养记录 +export const getRecorderList = (params) => { + return request({ + url: '/blade-desk/measuringUpkeep/page', + method: 'get', + params, + }); +}; + +// 量具保养新增列表数据 +export const addRecorderList = (params) => { + return request({ + url: '/blade-desk/measuringUpkeep/newlyAddedList', + method: 'get', + params, + }); +}; + +// 加入保养 +export const addRecorder = (params) => { + return request({ + url: '/blade-desk/measuringUpkeep/addMaintenance', + method: 'post', + params, + }); +}; + +// 量具保养申请 +export const applyRecorder = (params) => { + return request({ + url: '/blade-desk/measuringUpkeep/maintenanceAppFun', + method: 'post', + params, + }); +}; \ No newline at end of file diff --git a/src/api/equiptManagement/measurementRecords.js b/src/api/equiptManagement/measurementRecords.js new file mode 100644 index 0000000..e7ad9f2 --- /dev/null +++ b/src/api/equiptManagement/measurementRecords.js @@ -0,0 +1,11 @@ +// 计量记录 +import request from '@/axios'; + +// 计量记录列表 +export const getRecorderList = (params) => { + return request({ + url: '/blade-desk/measurementRecords/page', + method: 'get', + params, + }); +}; \ No newline at end of file diff --git a/src/api/equiptManagement/recorderList.js b/src/api/equiptManagement/recorderList.js index e7ba58b..9054de3 100644 --- a/src/api/equiptManagement/recorderList.js +++ b/src/api/equiptManagement/recorderList.js @@ -124,4 +124,22 @@ export const deleteRecorderLineSetting = (params) =>{ method: 'post', params }); +} + +// 记录仪历史曲线 +export const getRecorderHistoryLine = (data) =>{ + return request({ + url: '/api/blade-desk/recorder/loadCalRecorder', + method: 'post', + data + }); +} + +// 记录仪明细 +export const getRecorderHistoryDetail = (params) =>{ + return request({ + url: '/api/blade-desk/recorder/page', + method: 'get', + params + }); } \ No newline at end of file diff --git a/src/api/equiptManagement/reminderConfiguration.js b/src/api/equiptManagement/reminderConfiguration.js new file mode 100644 index 0000000..27bd41f --- /dev/null +++ b/src/api/equiptManagement/reminderConfiguration.js @@ -0,0 +1,47 @@ +// 提醒配置 +import request from '@/axios'; + +// 列表 +export const getList = (params) => { + return request({ + url: '/blade-desk/meteringRemindSet/page', + method: 'get', + params, + }); +}; + +// 新增 +export const addRemind = (data) => { + return request({ + url: '/blade-desk/meteringRemindSet/save', + method: 'post', + data, + }); +}; + +// 详情 +export const getDetail = (params) => { + return request({ + url: '/blade-desk/meteringRemindSet/detail', + method: 'get', + params, + }); +}; + +// 修改 +export const updateRemind = (data) => { + return request({ + url: '/blade-desk/meteringRemindSet/update', + method: 'post', + data, + }); +}; + +// 删除 +export const removeRemind = params => { + return request({ + url: '/blade-desk/meteringRemindSet/remove', + method: 'post', + params, + }); +}; \ No newline at end of file diff --git a/src/api/qualityManagement/periodicTesting/testTask.js b/src/api/qualityManagement/periodicTesting/testTask.js index 30fb5e0..fd64c37 100644 --- a/src/api/qualityManagement/periodicTesting/testTask.js +++ b/src/api/qualityManagement/periodicTesting/testTask.js @@ -107,3 +107,4 @@ export const exportExcel = (data) =>{ responseType: "blob", }) } + diff --git a/src/views/equiptManagement/equipmentLedger/index.vue b/src/views/equiptManagement/equipmentLedger/index.vue index d7e921c..d69b8af 100644 --- a/src/views/equiptManagement/equipmentLedger/index.vue +++ b/src/views/equiptManagement/equipmentLedger/index.vue @@ -98,7 +98,7 @@ export default { border: true, selection: true, viewBtn: true, - menuWidth: 240, + menuWidth: 180, dialogClickModal: false, excelBtn: true, viewBtn: false, @@ -191,9 +191,13 @@ export default { label: "正常服役", value: 1, }, + // { + // label: "服役中", + // value: 2, + // }, { label: "暂停服役", - value: 2, + value: 3, }, ], rules: [ @@ -373,6 +377,10 @@ export default { virtualMac: row.virtualMac ? 1 : 0, attachLink:row.attachLink.length > 0 ? row.attachLink[0] : '' } + console.log('link----------',row.attachLink && row.attachLink != '' && typeof(row.attachLink) == String ? row.attachLink : row.attachLink.length > 0 ? row.attachLink[0] : '') + console.log('row------------',row) + console.log('params------------',params) + editDevice(params).then(res => { if(res.data.code == 200){ this.$message.success('修改成功') @@ -428,6 +436,7 @@ export default { if (["edit", "view"].includes(type)) { getDetail({id:this.form.id}).then(res =>{ this.form = res.data.data + this.form.attachLink = [this.form.attachLink] this.form.virtualMac = this.form.virtualMac == 1 ? true : false }) } diff --git a/src/views/equiptManagement/measurementRecords/index.vue b/src/views/equiptManagement/measurementRecords/index.vue index be27dd8..d58d73d 100644 --- a/src/views/equiptManagement/measurementRecords/index.vue +++ b/src/views/equiptManagement/measurementRecords/index.vue @@ -34,7 +34,8 @@ @setCrewOpeSancel="setCrewOpeSancel" /> - + + + + \ No newline at end of file diff --git a/src/views/equiptManagement/workwearManagement/columnData.js b/src/views/equiptManagement/workwearManagement/columnData.js index aba6460..605ca21 100644 --- a/src/views/equiptManagement/workwearManagement/columnData.js +++ b/src/views/equiptManagement/workwearManagement/columnData.js @@ -110,7 +110,8 @@ export const feiBaOption = { delBtn: false, labelWidth: 120, searchLabelWidth: 120, - menuWidth: 140, + menuWidth: 80, + menuAlign:"center", dialogWidth: 600, dialogClickModal: false, searchEnter: true, @@ -192,7 +193,8 @@ export const rackOption = { delBtn: false, labelWidth: 120, searchLabelWidth: 120, - menuWidth: 140, + menuWidth: 80, + menuAlign:"center", dialogWidth: 600, dialogClickModal: false, searchEnter: true, diff --git a/src/views/equiptManagement/workwearManagement/index.vue b/src/views/equiptManagement/workwearManagement/index.vue index 660d26d..5ae1b3d 100644 --- a/src/views/equiptManagement/workwearManagement/index.vue +++ b/src/views/equiptManagement/workwearManagement/index.vue @@ -4,8 +4,9 @@ { this.data = res.data.data.records this.page.total = res.data.data.total + // setTimeout(() => { + // this.feibaLoading = false + // }, 50); }) }, getRackSet(){ + // this.gjLoading = true getRackSetList({ current:this.page.currentPage, size:this.page.pageSize, @@ -259,6 +268,9 @@ export default { }).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total + // setTimeout(() => { + // this.gjLoading = false + // }, 50); }) }, tabPositionChange(value, event) { diff --git a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue index fba2475..dc92661 100644 --- a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue +++ b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue @@ -1,6 +1,6 @@ - +
- 加入保养 + 加入保养
- + + - \ No newline at end of file + \ No newline at end of file