diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts index 579609c..3d2901a 100644 --- a/src/api/eqpt/measurementPlan/task.ts +++ b/src/api/eqpt/measurementPlan/task.ts @@ -34,3 +34,11 @@ data, }) } +// 取消任务单 +export function cancelTask(data: object) { + return request({ + url: '/business/order/cancel', + method: 'post', + data, + }) +} diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts index 579609c..3d2901a 100644 --- a/src/api/eqpt/measurementPlan/task.ts +++ b/src/api/eqpt/measurementPlan/task.ts @@ -34,3 +34,11 @@ data, }) } +// 取消任务单 +export function cancelTask(data: object) { + return request({ + url: '/business/order/cancel', + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts new file mode 100644 index 0000000..993c9d9 --- /dev/null +++ b/src/api/eqpt/status/index.ts @@ -0,0 +1,83 @@ +/** + * 状态管理相关接口 + */ +import request from '@/api/index' + +// 不同状态的列表 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/status/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/status/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/status/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/status/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 保存编辑 +export function editStatus(data: object) { + return request({ + url: '/status/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitStatus(data: object) { + return request({ + url: '/status/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteStatus(id: string) { + return request({ + url: `/status/approval/delete?id=${id}`, + method: 'post', + }) +} +// 取消 +export function cancelStatus(data: object) { + return request({ + url: '/status/approval/cancel', + method: 'post', + data, + }) +} +// 详情 +export function detailStatus(params: object) { + return request({ + url: '/status/approval/detail', + method: 'get', + params, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/status/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts index 579609c..3d2901a 100644 --- a/src/api/eqpt/measurementPlan/task.ts +++ b/src/api/eqpt/measurementPlan/task.ts @@ -34,3 +34,11 @@ data, }) } +// 取消任务单 +export function cancelTask(data: object) { + return request({ + url: '/business/order/cancel', + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts new file mode 100644 index 0000000..993c9d9 --- /dev/null +++ b/src/api/eqpt/status/index.ts @@ -0,0 +1,83 @@ +/** + * 状态管理相关接口 + */ +import request from '@/api/index' + +// 不同状态的列表 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/status/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/status/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/status/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/status/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 保存编辑 +export function editStatus(data: object) { + return request({ + url: '/status/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitStatus(data: object) { + return request({ + url: '/status/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteStatus(id: string) { + return request({ + url: `/status/approval/delete?id=${id}`, + method: 'post', + }) +} +// 取消 +export function cancelStatus(data: object) { + return request({ + url: '/status/approval/cancel', + method: 'post', + data, + }) +} +// 详情 +export function detailStatus(params: object) { + return request({ + url: '/status/approval/detail', + method: 'get', + params, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/status/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index a783667..6405f58 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -586,6 +586,18 @@ activeMenu: '/seallist', }, }, + { + path: '/sealpage/:type', + name: 'SealEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '封存申请', + auth: '/tested/status/seal', + sidebar: false, + breadcrumb: false, + activeMenu: '/seallist', + }, + }, ], }, { @@ -611,6 +623,18 @@ activeMenu: '/unseallist', }, }, + { + path: '/unsealpage/:type', + name: 'UnSealPageEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '启封申请', + auth: '/tested/status/unseal', + sidebar: false, + breadcrumb: false, + activeMenu: '/unseallist', + }, + }, ], }, { @@ -636,6 +660,18 @@ activeMenu: '/disablelist', }, }, + { + path: '/disablepage/:type', + name: 'SDiaableEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '禁用申请', + auth: '/tested/status/disable', + sidebar: false, + breadcrumb: false, + activeMenu: '/disablelist', + }, + }, ], }, { @@ -661,6 +697,18 @@ activeMenu: '/scraplist', }, }, + { + path: '/scrappage/:type', + name: 'SCrapEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '报废申请', + auth: '/tested/status/scrap', + sidebar: false, + breadcrumb: false, + activeMenu: '/scraplist', + }, + }, ], }, { diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts index 579609c..3d2901a 100644 --- a/src/api/eqpt/measurementPlan/task.ts +++ b/src/api/eqpt/measurementPlan/task.ts @@ -34,3 +34,11 @@ data, }) } +// 取消任务单 +export function cancelTask(data: object) { + return request({ + url: '/business/order/cancel', + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts new file mode 100644 index 0000000..993c9d9 --- /dev/null +++ b/src/api/eqpt/status/index.ts @@ -0,0 +1,83 @@ +/** + * 状态管理相关接口 + */ +import request from '@/api/index' + +// 不同状态的列表 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/status/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/status/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/status/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/status/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 保存编辑 +export function editStatus(data: object) { + return request({ + url: '/status/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitStatus(data: object) { + return request({ + url: '/status/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteStatus(id: string) { + return request({ + url: `/status/approval/delete?id=${id}`, + method: 'post', + }) +} +// 取消 +export function cancelStatus(data: object) { + return request({ + url: '/status/approval/cancel', + method: 'post', + data, + }) +} +// 详情 +export function detailStatus(params: object) { + return request({ + url: '/status/approval/detail', + method: 'get', + params, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/status/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index a783667..6405f58 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -586,6 +586,18 @@ activeMenu: '/seallist', }, }, + { + path: '/sealpage/:type', + name: 'SealEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '封存申请', + auth: '/tested/status/seal', + sidebar: false, + breadcrumb: false, + activeMenu: '/seallist', + }, + }, ], }, { @@ -611,6 +623,18 @@ activeMenu: '/unseallist', }, }, + { + path: '/unsealpage/:type', + name: 'UnSealPageEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '启封申请', + auth: '/tested/status/unseal', + sidebar: false, + breadcrumb: false, + activeMenu: '/unseallist', + }, + }, ], }, { @@ -636,6 +660,18 @@ activeMenu: '/disablelist', }, }, + { + path: '/disablepage/:type', + name: 'SDiaableEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '禁用申请', + auth: '/tested/status/disable', + sidebar: false, + breadcrumb: false, + activeMenu: '/disablelist', + }, + }, ], }, { @@ -661,6 +697,18 @@ activeMenu: '/scraplist', }, }, + { + path: '/scrappage/:type', + name: 'SCrapEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '报废申请', + auth: '/tested/status/scrap', + sidebar: false, + breadcrumb: false, + activeMenu: '/scraplist', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 41bb280..b6cd934 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -9,8 +9,8 @@ SUBCONTRACTOR_APPROVAL = 'fbfmlgl', // 分包方名录管理 SUBCONTRACT_REVIEW_APPROVAL = 'fbfpsbgl', // 分包方评审表 EQUIPMENT_SEALED_APPROVAL = 'sbfcsq', // 设备封存申请 - EQUIPMENT_UNSEALED_APPROVAL = 'sbgfsg', // 设备启封由请 + EQUIPMENT_UNSEALED_APPROVAL = 'sbgfsq', // 设备启封由请 EQUIPMENT_DISABLE_APPROVAL = 'sbjysq', // 设备禁用申请 EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请 - EQUIPMENT_DELAY_APPROVAL = 'sbbfsq"', // 设备延用申请 + EQUIPMENT_DELAY_APPROVAL = 'sbyysq"', // 设备延用申请 } diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 4d63cc4..c9ea810 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 西昌计量信息系统 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts new file mode 100644 index 0000000..636a5e4 --- /dev/null +++ b/src/api/eqpt/document/index.ts @@ -0,0 +1,42 @@ +/** + * 文档管理接口 + */ +import request from '@/api/index' +// 分页列表 +export function getListPage(params: object) { + return request({ + url: '/file/listPage', + method: 'get', + params, + }) +} +// 新建 +export function addDocument(data: object) { + return request({ + url: '/file/add', + method: 'post', + data, + }) +} +// 更新 +export function updateDocument(data: object) { + return request({ + url: '/file/update', + method: 'post', + data, + }) +} +// 详情 +export function detailDocument(id: string) { + return request({ + url: `/file/log?fileId=${id}`, + method: 'get', + }) +} +// 删除 +export function delDocument(id: string) { + return request({ + url: `/file/remove?fileId=${id}`, + method: 'post', + }) +} diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts index 579609c..3d2901a 100644 --- a/src/api/eqpt/measurementPlan/task.ts +++ b/src/api/eqpt/measurementPlan/task.ts @@ -34,3 +34,11 @@ data, }) } +// 取消任务单 +export function cancelTask(data: object) { + return request({ + url: '/business/order/cancel', + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts new file mode 100644 index 0000000..993c9d9 --- /dev/null +++ b/src/api/eqpt/status/index.ts @@ -0,0 +1,83 @@ +/** + * 状态管理相关接口 + */ +import request from '@/api/index' + +// 不同状态的列表 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/status/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/status/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/status/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/status/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 保存编辑 +export function editStatus(data: object) { + return request({ + url: '/status/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitStatus(data: object) { + return request({ + url: '/status/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteStatus(id: string) { + return request({ + url: `/status/approval/delete?id=${id}`, + method: 'post', + }) +} +// 取消 +export function cancelStatus(data: object) { + return request({ + url: '/status/approval/cancel', + method: 'post', + data, + }) +} +// 详情 +export function detailStatus(params: object) { + return request({ + url: '/status/approval/detail', + method: 'get', + params, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/status/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index a783667..6405f58 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -586,6 +586,18 @@ activeMenu: '/seallist', }, }, + { + path: '/sealpage/:type', + name: 'SealEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '封存申请', + auth: '/tested/status/seal', + sidebar: false, + breadcrumb: false, + activeMenu: '/seallist', + }, + }, ], }, { @@ -611,6 +623,18 @@ activeMenu: '/unseallist', }, }, + { + path: '/unsealpage/:type', + name: 'UnSealPageEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '启封申请', + auth: '/tested/status/unseal', + sidebar: false, + breadcrumb: false, + activeMenu: '/unseallist', + }, + }, ], }, { @@ -636,6 +660,18 @@ activeMenu: '/disablelist', }, }, + { + path: '/disablepage/:type', + name: 'SDiaableEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '禁用申请', + auth: '/tested/status/disable', + sidebar: false, + breadcrumb: false, + activeMenu: '/disablelist', + }, + }, ], }, { @@ -661,6 +697,18 @@ activeMenu: '/scraplist', }, }, + { + path: '/scrappage/:type', + name: 'SCrapEdit', + component: () => import('@/views/tested/status/delay/components/edit.vue'), + meta: { + title: '报废申请', + auth: '/tested/status/scrap', + sidebar: false, + breadcrumb: false, + activeMenu: '/scraplist', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 41bb280..b6cd934 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -9,8 +9,8 @@ SUBCONTRACTOR_APPROVAL = 'fbfmlgl', // 分包方名录管理 SUBCONTRACT_REVIEW_APPROVAL = 'fbfpsbgl', // 分包方评审表 EQUIPMENT_SEALED_APPROVAL = 'sbfcsq', // 设备封存申请 - EQUIPMENT_UNSEALED_APPROVAL = 'sbgfsg', // 设备启封由请 + EQUIPMENT_UNSEALED_APPROVAL = 'sbgfsq', // 设备启封由请 EQUIPMENT_DISABLE_APPROVAL = 'sbjysq', // 设备禁用申请 EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请 - EQUIPMENT_DELAY_APPROVAL = 'sbbfsq"', // 设备延用申请 + EQUIPMENT_DELAY_APPROVAL = 'sbyysq"', // 设备延用申请 } diff --git a/src/views/login.vue b/src/views/login.vue index 714b44f..01c0cba 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -211,7 +211,7 @@