diff --git a/package.json b/package.json
index 15a856f..88d1597 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
- "name": "eqc-vue-plus",
- "version": "4.8.1",
+ "name": "eqc-ui",
+ "version": "1.0.0",
"description": "EQC-设备质控管理系统",
- "author": "LionLi",
+ "author": "yunpeng.zhang",
"license": "MIT",
"scripts": {
"dev": "vite",
diff --git a/src/api/demo/demo.js b/src/api/demo/demo.js
deleted file mode 100644
index 04d4025..0000000
--- a/src/api/demo/demo.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试单表列表
-export function listDemo(query) {
- return request({
- url: '/demo/demo/list',
- method: 'get',
- params: query
- })
-}
-
-// 自定义分页接口
-export function pageDemo(query) {
- return request({
- url: '/demo/demo/page',
- method: 'get',
- params: query
- })
-}
-
-// 查询测试单表详细
-export function getDemo(id) {
- return request({
- url: '/demo/demo/' + id,
- method: 'get'
- })
-}
-
-// 新增测试单表
-export function addDemo(data) {
- return request({
- url: '/demo/demo',
- method: 'post',
- data: data
- })
-}
-
-// 修改测试单表
-export function updateDemo(data) {
- return request({
- url: '/demo/demo',
- method: 'put',
- data: data
- })
-}
-
-// 删除测试单表
-export function delDemo(id) {
- return request({
- url: '/demo/demo/' + id,
- method: 'delete'
- })
-}
-
diff --git a/src/api/demo/tree.js b/src/api/demo/tree.js
deleted file mode 100644
index 4c7ebc0..0000000
--- a/src/api/demo/tree.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试树表列表
-export function listTree(query) {
- return request({
- url: '/demo/tree/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询测试树表详细
-export function getTree(id) {
- return request({
- url: '/demo/tree/' + id,
- method: 'get'
- })
-}
-
-// 新增测试树表
-export function addTree(data) {
- return request({
- url: '/demo/tree',
- method: 'post',
- data: data
- })
-}
-
-// 修改测试树表
-export function updateTree(data) {
- return request({
- url: '/demo/tree',
- method: 'put',
- data: data
- })
-}
-
-// 删除测试树表
-export function delTree(id) {
- return request({
- url: '/demo/tree/' + id,
- method: 'delete'
- })
-}
diff --git a/src/api/equipments/consumables.js b/src/api/equipments/consumables.js
new file mode 100644
index 0000000..965c90f
--- /dev/null
+++ b/src/api/equipments/consumables.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备耗材列表
+export function listConsumables(query) {
+ return request({
+ url: '/system/consumables/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备耗材详细
+export function getConsumables(consumableId) {
+ return request({
+ url: '/system/consumables/' + consumableId,
+ method: 'get'
+ })
+}
+
+// 新增设备耗材
+export function addConsumables(data) {
+ return request({
+ url: '/system/consumables',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备耗材
+export function updateConsumables(data) {
+ return request({
+ url: '/system/consumables',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备耗材
+export function delConsumables(consumableId) {
+ return request({
+ url: '/system/consumables/' + consumableId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/equipments/equipments.js b/src/api/equipments/equipments.js
new file mode 100644
index 0000000..bd7bc06
--- /dev/null
+++ b/src/api/equipments/equipments.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备列表
+export function listEquipments(query) {
+ return request({
+ url: '/equipments/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备详细
+export function getEquipments(equipmentId) {
+ return request({
+ url: '/equipments/' + equipmentId,
+ method: 'get'
+ })
+}
+
+// 新增设备
+export function addEquipments(data) {
+ return request({
+ url: '/equipments',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备
+export function updateEquipments(data) {
+ return request({
+ url: '/equipments',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备
+export function delEquipments(equipmentId) {
+ return request({
+ url: '/equipments/' + equipmentId,
+ method: 'delete'
+ })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fc3faec..f946d66 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -47,8 +47,6 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import HeaderSearch from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
deleted file mode 100644
index fa81f82..0000000
--- a/src/views/demo/demo/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 搜索(自定义分页接口)
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导入(校验)
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 将文件拖到此处，或点击上传
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 展开/折叠
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 新增
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/equipments/consumables.vue b/src/views/equipments/consumables.vue
new file mode 100644
index 0000000..58120f5
--- /dev/null
+++ b/src/views/equipments/consumables.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.activationTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.equipmentName }}
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+