diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/views/customer/bench/bench-interface.ts b/src/views/customer/bench/bench-interface.ts index 5c995ec..8db4604 100644 --- a/src/views/customer/bench/bench-interface.ts +++ b/src/views/customer/bench/bench-interface.ts @@ -1,4 +1,5 @@ +// 折线图返回数据格式 export interface planReturn { - date: string - count: string | number + date: string // 日期 + count: string | number // 值 } diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/views/customer/bench/bench-interface.ts b/src/views/customer/bench/bench-interface.ts index 5c995ec..8db4604 100644 --- a/src/views/customer/bench/bench-interface.ts +++ b/src/views/customer/bench/bench-interface.ts @@ -1,4 +1,5 @@ +// 折线图返回数据格式 export interface planReturn { - date: string - count: string | number + date: string // 日期 + count: string | number // 值 } diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue index 687a18d..6b502fc 100644 --- a/src/views/customer/bench/bench.vue +++ b/src/views/customer/bench/bench.vue @@ -100,18 +100,6 @@ // 获取客户新增趋势数据 function fetchCustomerExpireData() { getCustomerExpireData().then((res) => { - // const res = { - // data: [ - // { - // date: '2021-09', - // count: '10', - // }, - // { - // date: '09090', - // count: '10', - // }, - // ], - // } customerAddXData.value = res.data.map((item: planReturn) => item.date) const yValue = res.data.map((item: planReturn) => Number(item.count)) customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10 diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/views/customer/bench/bench-interface.ts b/src/views/customer/bench/bench-interface.ts index 5c995ec..8db4604 100644 --- a/src/views/customer/bench/bench-interface.ts +++ b/src/views/customer/bench/bench-interface.ts @@ -1,4 +1,5 @@ +// 折线图返回数据格式 export interface planReturn { - date: string - count: string | number + date: string // 日期 + count: string | number // 值 } diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue index 687a18d..6b502fc 100644 --- a/src/views/customer/bench/bench.vue +++ b/src/views/customer/bench/bench.vue @@ -100,18 +100,6 @@ // 获取客户新增趋势数据 function fetchCustomerExpireData() { getCustomerExpireData().then((res) => { - // const res = { - // data: [ - // { - // date: '2021-09', - // count: '10', - // }, - // { - // date: '09090', - // count: '10', - // }, - // ], - // } customerAddXData.value = res.data.map((item: planReturn) => item.date) const yValue = res.data.map((item: planReturn) => Number(item.count)) customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10 diff --git a/src/views/device/bench/bench-interface.ts b/src/views/device/bench/bench-interface.ts new file mode 100644 index 0000000..dee2840 --- /dev/null +++ b/src/views/device/bench/bench-interface.ts @@ -0,0 +1,18 @@ +// 折线图返回数据格式 +export interface IPlanReturn { + date: string // 日期 + count: string | number // 值 +} + +// 本月统计数据 +export interface IPlanMonthlyStatisticsReturn { + state: string // 类型 + count: string // 值 +} + +// 设备台账提醒、标准设备到期提醒表格数据 +export interface ITableData { + equipmentName: string // 设备名称 + usePersonName: string // 负责人 + mesureDate: string // 上次检定时间 +} diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/views/customer/bench/bench-interface.ts b/src/views/customer/bench/bench-interface.ts index 5c995ec..8db4604 100644 --- a/src/views/customer/bench/bench-interface.ts +++ b/src/views/customer/bench/bench-interface.ts @@ -1,4 +1,5 @@ +// 折线图返回数据格式 export interface planReturn { - date: string - count: string | number + date: string // 日期 + count: string | number // 值 } diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue index 687a18d..6b502fc 100644 --- a/src/views/customer/bench/bench.vue +++ b/src/views/customer/bench/bench.vue @@ -100,18 +100,6 @@ // 获取客户新增趋势数据 function fetchCustomerExpireData() { getCustomerExpireData().then((res) => { - // const res = { - // data: [ - // { - // date: '2021-09', - // count: '10', - // }, - // { - // date: '09090', - // count: '10', - // }, - // ], - // } customerAddXData.value = res.data.map((item: planReturn) => item.date) const yValue = res.data.map((item: planReturn) => Number(item.count)) customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10 diff --git a/src/views/device/bench/bench-interface.ts b/src/views/device/bench/bench-interface.ts new file mode 100644 index 0000000..dee2840 --- /dev/null +++ b/src/views/device/bench/bench-interface.ts @@ -0,0 +1,18 @@ +// 折线图返回数据格式 +export interface IPlanReturn { + date: string // 日期 + count: string | number // 值 +} + +// 本月统计数据 +export interface IPlanMonthlyStatisticsReturn { + state: string // 类型 + count: string // 值 +} + +// 设备台账提醒、标准设备到期提醒表格数据 +export interface ITableData { + equipmentName: string // 设备名称 + usePersonName: string // 负责人 + mesureDate: string // 上次检定时间 +} diff --git a/src/views/device/bench/deviceBench.vue b/src/views/device/bench/deviceBench.vue index 8d74984..8acd0d8 100644 --- a/src/views/device/bench/deviceBench.vue +++ b/src/views/device/bench/deviceBench.vue @@ -1,114 +1,189 @@ @@ -137,6 +212,7 @@
测量设备 - {{ theMonthTotalData.testValue }} + {{ theMonthTotalData.measureSum }}
@@ -209,7 +287,7 @@
标准装置 - {{ theMonthTotalData.standardValue }} + {{ theMonthTotalData.standardSum }}
@@ -260,6 +338,7 @@
待检定设备数量 - {{ myEquipment.stay }} + {{ myEquipment.verifiedNum }}
超期未检定设备数量 - {{ myEquipment.not }} + {{ myEquipment.overtimeNum }}
diff --git a/src/api/device/bench.ts b/src/api/device/bench.ts new file mode 100644 index 0000000..f4792d1 --- /dev/null +++ b/src/api/device/bench.ts @@ -0,0 +1,44 @@ +// 设备借用相关接口api +import request from '../index' +const prefix = '/equipment/workbench' + +// 设备检定趋势 +export function getMeasureTrend() { + return request({ + url: `${prefix}/measureTrend`, + method: 'post', + }) +} + +// 装置检定趋势 +export function getStandardTrend() { + return request({ + url: `${prefix}/standardTrend`, + method: 'post', + }) +} + +// 本月统计数据 +export function getMonthlyStatistics() { + return request({ + url: `${prefix}/dataStatistics`, + method: 'post', + }) +} + +// 我的设备 +export function getMyEquipment() { + return request({ + url: `${prefix}/myselfEquipment`, + method: 'post', + }) +} + +// 设备台账检定提醒 +export function getStandingBookRemind() { + return request({ + url: `${prefix}/remindListPage`, + method: 'post', + }) +} + diff --git a/src/views/customer/bench/bench-interface.ts b/src/views/customer/bench/bench-interface.ts index 5c995ec..8db4604 100644 --- a/src/views/customer/bench/bench-interface.ts +++ b/src/views/customer/bench/bench-interface.ts @@ -1,4 +1,5 @@ +// 折线图返回数据格式 export interface planReturn { - date: string - count: string | number + date: string // 日期 + count: string | number // 值 } diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue index 687a18d..6b502fc 100644 --- a/src/views/customer/bench/bench.vue +++ b/src/views/customer/bench/bench.vue @@ -100,18 +100,6 @@ // 获取客户新增趋势数据 function fetchCustomerExpireData() { getCustomerExpireData().then((res) => { - // const res = { - // data: [ - // { - // date: '2021-09', - // count: '10', - // }, - // { - // date: '09090', - // count: '10', - // }, - // ], - // } customerAddXData.value = res.data.map((item: planReturn) => item.date) const yValue = res.data.map((item: planReturn) => Number(item.count)) customerAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10 diff --git a/src/views/device/bench/bench-interface.ts b/src/views/device/bench/bench-interface.ts new file mode 100644 index 0000000..dee2840 --- /dev/null +++ b/src/views/device/bench/bench-interface.ts @@ -0,0 +1,18 @@ +// 折线图返回数据格式 +export interface IPlanReturn { + date: string // 日期 + count: string | number // 值 +} + +// 本月统计数据 +export interface IPlanMonthlyStatisticsReturn { + state: string // 类型 + count: string // 值 +} + +// 设备台账提醒、标准设备到期提醒表格数据 +export interface ITableData { + equipmentName: string // 设备名称 + usePersonName: string // 负责人 + mesureDate: string // 上次检定时间 +} diff --git a/src/views/device/bench/deviceBench.vue b/src/views/device/bench/deviceBench.vue index 8d74984..8acd0d8 100644 --- a/src/views/device/bench/deviceBench.vue +++ b/src/views/device/bench/deviceBench.vue @@ -1,114 +1,189 @@ @@ -137,6 +212,7 @@
测量设备 - {{ theMonthTotalData.testValue }} + {{ theMonthTotalData.measureSum }}
@@ -209,7 +287,7 @@
标准装置 - {{ theMonthTotalData.standardValue }} + {{ theMonthTotalData.standardSum }}
@@ -260,6 +338,7 @@
待检定设备数量 - {{ myEquipment.stay }} + {{ myEquipment.verifiedNum }}
超期未检定设备数量 - {{ myEquipment.not }} + {{ myEquipment.overtimeNum }}
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue index 8e6c8b4..5a82cee 100644 --- a/src/views/device/receive/applyList.vue +++ b/src/views/device/receive/applyList.vue @@ -315,7 +315,7 @@ fetchData(true) } -// 获取用户列表 +// 获取用户列表(增加模糊查询) const fetchUserList = () => { getUserList({ offset: 1, limit: 999999 }).then((res: any) => { usePersonList.value = res.data.rows