diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index a2af905..b21ad07 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -72,6 +72,18 @@ }, }, { + path: 'equipmentReminderDetail/:id', + name: 'EquipmentReminderDetail', + component: () => import('@/views/business/board/equipmentReminder/detail.vue'), + meta: { + title: '设备到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/board/equipmentReminderList', + }, + }, + { path: 'standardReminderList', name: 'StandardReminderList', component: () => import('@/views/business/board/standardReminder/list.vue'), @@ -91,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - { - path: 'departmentalOutputAnalysis', - name: 'JobAccountList', - component: () => import('@/views/business/board/jobAccount/list.vue'), - meta: { - title: '部门产值分析', - icon: 'ep:key', - auth: '/business/board/departmentalOutputAnalysis', - }, - }, + // { + // path: 'departmentalOutputAnalysis', + // name: 'JobAccountList', + // component: () => import('@/views/business/board/jobAccount/list.vue'), + // meta: { + // title: '部门产值分析', + // icon: 'ep:key', + // auth: '/business/board/departmentalOutputAnalysis', + // }, + // }, ], }, { diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index a2af905..b21ad07 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -72,6 +72,18 @@ }, }, { + path: 'equipmentReminderDetail/:id', + name: 'EquipmentReminderDetail', + component: () => import('@/views/business/board/equipmentReminder/detail.vue'), + meta: { + title: '设备到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/board/equipmentReminderList', + }, + }, + { path: 'standardReminderList', name: 'StandardReminderList', component: () => import('@/views/business/board/standardReminder/list.vue'), @@ -91,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - { - path: 'departmentalOutputAnalysis', - name: 'JobAccountList', - component: () => import('@/views/business/board/jobAccount/list.vue'), - meta: { - title: '部门产值分析', - icon: 'ep:key', - auth: '/business/board/departmentalOutputAnalysis', - }, - }, + // { + // path: 'departmentalOutputAnalysis', + // name: 'JobAccountList', + // component: () => import('@/views/business/board/jobAccount/list.vue'), + // meta: { + // title: '部门产值分析', + // icon: 'ep:key', + // auth: '/business/board/departmentalOutputAnalysis', + // }, + // }, ], }, { diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts new file mode 100644 index 0000000..1e8664a --- /dev/null +++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts @@ -0,0 +1,32 @@ +// 筛选 +export interface IListQuery { + equipmentName: string // 设备名称 + equipmentNo: string // 设备编号 + mesureType: string // 检定方式 + useDept: string // 使用部门 + usePerson: string // 使用人 + limit: number + offset: number +} + +// 字典 +export interface dictType { + name: string + id: string + value: string +} +// 表格数据 +export interface IList { + id: string // 主键 + equipmentNo: string // 设备编号 + equipmentName: string // 名称 + modelNo: string // 型号 + ABC: string // ABC + mesureTypeName: string // 检定方式 + managerStateName: string // 管理状态 + useDeptName: string // 使用部门 + managerStausePersonNameteName: string // 使用人 + validDate: string // 有效日期 + remark: string // 备注 +} + diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index a2af905..b21ad07 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -72,6 +72,18 @@ }, }, { + path: 'equipmentReminderDetail/:id', + name: 'EquipmentReminderDetail', + component: () => import('@/views/business/board/equipmentReminder/detail.vue'), + meta: { + title: '设备到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/board/equipmentReminderList', + }, + }, + { path: 'standardReminderList', name: 'StandardReminderList', component: () => import('@/views/business/board/standardReminder/list.vue'), @@ -91,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - { - path: 'departmentalOutputAnalysis', - name: 'JobAccountList', - component: () => import('@/views/business/board/jobAccount/list.vue'), - meta: { - title: '部门产值分析', - icon: 'ep:key', - auth: '/business/board/departmentalOutputAnalysis', - }, - }, + // { + // path: 'departmentalOutputAnalysis', + // name: 'JobAccountList', + // component: () => import('@/views/business/board/jobAccount/list.vue'), + // meta: { + // title: '部门产值分析', + // icon: 'ep:key', + // auth: '/business/board/departmentalOutputAnalysis', + // }, + // }, ], }, { diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts new file mode 100644 index 0000000..1e8664a --- /dev/null +++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts @@ -0,0 +1,32 @@ +// 筛选 +export interface IListQuery { + equipmentName: string // 设备名称 + equipmentNo: string // 设备编号 + mesureType: string // 检定方式 + useDept: string // 使用部门 + usePerson: string // 使用人 + limit: number + offset: number +} + +// 字典 +export interface dictType { + name: string + id: string + value: string +} +// 表格数据 +export interface IList { + id: string // 主键 + equipmentNo: string // 设备编号 + equipmentName: string // 名称 + modelNo: string // 型号 + ABC: string // ABC + mesureTypeName: string // 检定方式 + managerStateName: string // 管理状态 + useDeptName: string // 使用部门 + managerStausePersonNameteName: string // 使用人 + validDate: string // 有效日期 + remark: string // 备注 +} + diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue index ec6a9b7..301487b 100644 --- a/src/views/business/board/equipmentReminder/list.vue +++ b/src/views/business/board/equipmentReminder/list.vue @@ -1,14 +1,327 @@ +a diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index a2af905..b21ad07 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -72,6 +72,18 @@ }, }, { + path: 'equipmentReminderDetail/:id', + name: 'EquipmentReminderDetail', + component: () => import('@/views/business/board/equipmentReminder/detail.vue'), + meta: { + title: '设备到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/board/equipmentReminderList', + }, + }, + { path: 'standardReminderList', name: 'StandardReminderList', component: () => import('@/views/business/board/standardReminder/list.vue'), @@ -91,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - { - path: 'departmentalOutputAnalysis', - name: 'JobAccountList', - component: () => import('@/views/business/board/jobAccount/list.vue'), - meta: { - title: '部门产值分析', - icon: 'ep:key', - auth: '/business/board/departmentalOutputAnalysis', - }, - }, + // { + // path: 'departmentalOutputAnalysis', + // name: 'JobAccountList', + // component: () => import('@/views/business/board/jobAccount/list.vue'), + // meta: { + // title: '部门产值分析', + // icon: 'ep:key', + // auth: '/business/board/departmentalOutputAnalysis', + // }, + // }, ], }, { diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts new file mode 100644 index 0000000..1e8664a --- /dev/null +++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts @@ -0,0 +1,32 @@ +// 筛选 +export interface IListQuery { + equipmentName: string // 设备名称 + equipmentNo: string // 设备编号 + mesureType: string // 检定方式 + useDept: string // 使用部门 + usePerson: string // 使用人 + limit: number + offset: number +} + +// 字典 +export interface dictType { + name: string + id: string + value: string +} +// 表格数据 +export interface IList { + id: string // 主键 + equipmentNo: string // 设备编号 + equipmentName: string // 名称 + modelNo: string // 型号 + ABC: string // ABC + mesureTypeName: string // 检定方式 + managerStateName: string // 管理状态 + useDeptName: string // 使用部门 + managerStausePersonNameteName: string // 使用人 + validDate: string // 有效日期 + remark: string // 备注 +} + diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue index ec6a9b7..301487b 100644 --- a/src/views/business/board/equipmentReminder/list.vue +++ b/src/views/business/board/equipmentReminder/list.vue @@ -1,14 +1,327 @@ +a diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue index d444d25..7631686 100644 --- a/src/views/business/board/jobAccount/list.vue +++ b/src/views/business/board/jobAccount/list.vue @@ -8,6 +8,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' +import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount' const { proxy } = getCurrentInstance() as any // 查询条件 const listQuery: Ref = ref({ @@ -16,15 +17,15 @@ }) // 表头 const columns = ref([ - { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' }, - { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' }, - { text: '当日检测完样品', value: 'jcsys', align: 'center' }, - { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' }, - { text: '当日到期样品数', value: 'jcsys', align: 'center' }, - { text: '今年样品数', value: 'jcsys', align: 'center' }, - { text: '今年超期样品总数', value: 'jcsys', align: 'center' }, - { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' }, - { text: '超期率', value: 'jcsys', align: 'center', width: '180' }, + { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' }, + { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' }, + { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' }, + { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' }, + { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' }, + { text: '今年样品数', value: 'samplesYear', align: 'center' }, + { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' }, + { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' }, + { text: '超期率', value: 'expireRate', align: 'center' }, ]) // 表格数据 @@ -45,17 +46,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.value.offset = 1 } - // getTaskList(listQuery.value).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // loadingTable.value = false - // }) - list.value = [ - { - jcsys: 'test', - }, - ] - loadingTable.value = false + getJobAccountList().then((response) => { + list.value = response.data + // total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 多选发生改变时 @@ -82,15 +77,10 @@ background: 'rgba(255, 255, 255, 0.8)', }) if (list.value.length > 0) { - const params = { - offset: 1, - limit: 20, - ids: checkoutList.value, - } - // exportTaskList(params).then((res) => { - // const blob = new Blob([res.data]) - // exportFile(blob, '实时工作统计列表.xlsx') - // }) + exportJobAccountList().then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '实时工作统计列表.xlsx') + }) } else { ElMessage.warning('无数据可导出数据') @@ -133,8 +123,8 @@ diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts new file mode 100644 index 0000000..37db34d --- /dev/null +++ b/src/api/business/board/equipmentReminder.ts @@ -0,0 +1,40 @@ +// 设备到期提醒 +import request from '../../index' +import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface' + +// 设备到期提醒列表 +export function getEquipmentReminderList(data: IListQuery) { + return request({ + url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 设备到期提醒导出 +export function exportEquipmentReminderList(data: IListQuery) { + return request({ + url: '/meter/assets/exportList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 催办 +export function urgeEquipmentReminderList(data: { id: string }) { + return request({ + url: '/meter/assets/remindWorker', + method: 'post', + data, + }) +} + +// 固定资产详情 +export function getEquipmentReminderDetail(data: object) { + return request({ + url: '/meter/assets/detail', + method: 'post', + data, + }) +} diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts new file mode 100644 index 0000000..5feeedb --- /dev/null +++ b/src/api/business/board/jobAccount.ts @@ -0,0 +1,21 @@ +// 实时工作统计 +import request from '../../index' + +// 实时工作统计列表 +export function getJobAccountList() { + return request({ + url: '/business/board/workStatistics', + method: 'get', + }) +} + +// 实时工作统计导出 +export function exportJobAccountList() { + return request({ + url: '/business/board/workStatistics/export', + method: 'get', + responseType: 'blob', + // data, + }) +} + diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 3a6a285..b3c1920 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -51,7 +51,7 @@ endTime: '', deptId: '', offset: 1, - limit: 5, + limit: 20, sort: 'id', deptType: '', }) @@ -166,7 +166,8 @@ :query="listQuery" :list-loading="loading" :is-showmulti-select="multi" - :page-sizes="[5]" + :height="260" + :page-sizes="[20]" @change="changePage" @multi-select="multiSelect" > diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index a2af905..b21ad07 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -72,6 +72,18 @@ }, }, { + path: 'equipmentReminderDetail/:id', + name: 'EquipmentReminderDetail', + component: () => import('@/views/business/board/equipmentReminder/detail.vue'), + meta: { + title: '设备到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/board/equipmentReminderList', + }, + }, + { path: 'standardReminderList', name: 'StandardReminderList', component: () => import('@/views/business/board/standardReminder/list.vue'), @@ -91,16 +103,16 @@ auth: '/business/board/jobAccount', }, }, - { - path: 'departmentalOutputAnalysis', - name: 'JobAccountList', - component: () => import('@/views/business/board/jobAccount/list.vue'), - meta: { - title: '部门产值分析', - icon: 'ep:key', - auth: '/business/board/departmentalOutputAnalysis', - }, - }, + // { + // path: 'departmentalOutputAnalysis', + // name: 'JobAccountList', + // component: () => import('@/views/business/board/jobAccount/list.vue'), + // meta: { + // title: '部门产值分析', + // icon: 'ep:key', + // auth: '/business/board/departmentalOutputAnalysis', + // }, + // }, ], }, { diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts new file mode 100644 index 0000000..1e8664a --- /dev/null +++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts @@ -0,0 +1,32 @@ +// 筛选 +export interface IListQuery { + equipmentName: string // 设备名称 + equipmentNo: string // 设备编号 + mesureType: string // 检定方式 + useDept: string // 使用部门 + usePerson: string // 使用人 + limit: number + offset: number +} + +// 字典 +export interface dictType { + name: string + id: string + value: string +} +// 表格数据 +export interface IList { + id: string // 主键 + equipmentNo: string // 设备编号 + equipmentName: string // 名称 + modelNo: string // 型号 + ABC: string // ABC + mesureTypeName: string // 检定方式 + managerStateName: string // 管理状态 + useDeptName: string // 使用部门 + managerStausePersonNameteName: string // 使用人 + validDate: string // 有效日期 + remark: string // 备注 +} + diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue index ec6a9b7..301487b 100644 --- a/src/views/business/board/equipmentReminder/list.vue +++ b/src/views/business/board/equipmentReminder/list.vue @@ -1,14 +1,327 @@ +a diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue index d444d25..7631686 100644 --- a/src/views/business/board/jobAccount/list.vue +++ b/src/views/business/board/jobAccount/list.vue @@ -8,6 +8,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' +import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount' const { proxy } = getCurrentInstance() as any // 查询条件 const listQuery: Ref = ref({ @@ -16,15 +17,15 @@ }) // 表头 const columns = ref([ - { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' }, - { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' }, - { text: '当日检测完样品', value: 'jcsys', align: 'center' }, - { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' }, - { text: '当日到期样品数', value: 'jcsys', align: 'center' }, - { text: '今年样品数', value: 'jcsys', align: 'center' }, - { text: '今年超期样品总数', value: 'jcsys', align: 'center' }, - { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' }, - { text: '超期率', value: 'jcsys', align: 'center', width: '180' }, + { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' }, + { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' }, + { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' }, + { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' }, + { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' }, + { text: '今年样品数', value: 'samplesYear', align: 'center' }, + { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' }, + { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' }, + { text: '超期率', value: 'expireRate', align: 'center' }, ]) // 表格数据 @@ -45,17 +46,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.value.offset = 1 } - // getTaskList(listQuery.value).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // loadingTable.value = false - // }) - list.value = [ - { - jcsys: 'test', - }, - ] - loadingTable.value = false + getJobAccountList().then((response) => { + list.value = response.data + // total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 多选发生改变时 @@ -82,15 +77,10 @@ background: 'rgba(255, 255, 255, 0.8)', }) if (list.value.length > 0) { - const params = { - offset: 1, - limit: 20, - ids: checkoutList.value, - } - // exportTaskList(params).then((res) => { - // const blob = new Blob([res.data]) - // exportFile(blob, '实时工作统计列表.xlsx') - // }) + exportJobAccountList().then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '实时工作统计列表.xlsx') + }) } else { ElMessage.warning('无数据可导出数据') @@ -133,8 +123,8 @@ diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index 888f4b6..8f8d59d 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -95,7 +95,12 @@ window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`) window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`) // 调保存接口 - processSetting.value.saveSet() + getRowData.value.name = form.value.name // 流程名称 + getRowData.value.business = form.value.business // 关联业务 + getRowData.value.desc = form.value.desc // 流程名称 + getRowData.value.formDesc = form.value.desc // 流程名称 + console.log('999999999999999', getRowData.value) + processSetting.value.saveSet('edit', getRowData.value) } else { console.log('error submit!', fields) @@ -103,6 +108,16 @@ }) } +// 监听可选决策项、是否通知发起人获取到数据了 +const getNotice = () => { + if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项 + form.value.decisionItem = window.sessionStorage.getItem('decisionItem')! + } + if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人 + form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')! + } +} + onMounted(() => { const rowData: any = $route.query.rowData getRowData.value = JSON.parse(rowData) @@ -112,12 +127,6 @@ form.value.name = getRowData.value.name form.value.business = getRowData.value.business form.value.desc = getRowData.value.describe - if (window.sessionStorage.getItem('decisionItem')) { // 可选决策项 - form.value.decisionItem = window.sessionStorage.getItem('decisionItem')! - } - if (window.sessionStorage.getItem('noticeStarter')) { // 是否通知发起人 - form.value.noticeStarter = window.sessionStorage.getItem('noticeStarter')! - } }) @@ -147,7 +156,7 @@ - + @@ -201,7 +210,7 @@ - +