From 665e28a28ae8585b3203832ad2dd55d5f6d18e1a Mon Sep 17 00:00:00 2001 From: yunpeng Date: Mon, 1 Jan 2024 21:41:55 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E8=80=97=E6=9D=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/equipments/consumables.js | 10 +- src/api/equipments/equipments.js | 8 + src/api/system/user.js | 7 + src/router/index.js | 14 ++ src/views/equipments/consumables.vue | 362 +++++++++++++++++++-------- src/views/equipments/index.vue | 239 ++++++++++++------ vite.config.js | 4 +- 7 files changed, 448 insertions(+), 196 deletions(-) diff --git a/src/api/equipments/consumables.js b/src/api/equipments/consumables.js index 965c90f..23b0876 100644 --- a/src/api/equipments/consumables.js +++ b/src/api/equipments/consumables.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询设备耗材列表 export function listConsumables(query) { return request({ - url: '/system/consumables/list', + url: '/equipment/consumables/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listConsumables(query) { // 查询设备耗材详细 export function getConsumables(consumableId) { return request({ - url: '/system/consumables/' + consumableId, + url: '/equipment/consumables/' + consumableId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getConsumables(consumableId) { // 新增设备耗材 export function addConsumables(data) { return request({ - url: '/system/consumables', + url: '/equipment/consumables', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addConsumables(data) { // 修改设备耗材 export function updateConsumables(data) { return request({ - url: '/system/consumables', + url: '/equipment/consumables', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateConsumables(data) { // 删除设备耗材 export function delConsumables(consumableId) { return request({ - url: '/system/consumables/' + consumableId, + url: '/equipment/consumables/' + consumableId, method: 'delete' }) } diff --git a/src/api/equipments/equipments.js b/src/api/equipments/equipments.js index bd7bc06..441910b 100644 --- a/src/api/equipments/equipments.js +++ b/src/api/equipments/equipments.js @@ -42,3 +42,11 @@ export function delEquipments(equipmentId) { method: 'delete' }) } + +// 获取设备选择框列表 +export function optionSelect() { + return request({ + url: '/equipments/optionSelect', + method: 'get' + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index f2f76ef..ae2cb86 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -133,3 +133,10 @@ export function deptTreeSelect() { method: 'get' }) } + +export function userOptionsSelect() { + return request({ + url: '/system/user/optionsSelect', + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index 2559686..ed2e17f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -157,6 +157,20 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] + }, + { + path: '/equipments/consumables', + component: Layout, + hidden: true, + permissions: ['equipment:consumables:list'], + children: [ + { + path: 'index/:equipmentId(\\d+)', + component: () => import('@/views/equipments/consumables'), + name: 'Consumables', + meta: { title: '设备耗材', activeMenu: '/equipments' } + } + ] } ] diff --git a/src/views/equipments/consumables.vue b/src/views/equipments/consumables.vue index 58120f5..202f5e3 100644 --- a/src/views/equipments/consumables.vue +++ b/src/views/equipments/consumables.vue @@ -1,13 +1,21 @@ diff --git a/src/views/equipments/index.vue b/src/views/equipments/index.vue index bf30ce5..854a87c 100644 --- a/src/views/equipments/index.vue +++ b/src/views/equipments/index.vue @@ -1,6 +1,12 @@