diff --git a/klp-ui/src/api/mes/eqp/equipmentManagement.js b/klp-ui/src/api/mes/eqp/equipmentManagement.js
new file mode 100644
index 00000000..fcab6801
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/equipmentManagement.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备管理(合并在役和退役设备)列表
+export function listEquipmentManagement(query) {
+ return request({
+ url: '/eqp/equipmentManagement/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备管理(合并在役和退役设备)详细
+export function getEquipmentManagement(equipmentId) {
+ return request({
+ url: '/eqp/equipmentManagement/' + equipmentId,
+ method: 'get'
+ })
+}
+
+// 新增设备管理(合并在役和退役设备)
+export function addEquipmentManagement(data) {
+ return request({
+ url: '/eqp/equipmentManagement',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备管理(合并在役和退役设备)
+export function updateEquipmentManagement(data) {
+ return request({
+ url: '/eqp/equipmentManagement',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备管理(合并在役和退役设备)
+export function delEquipmentManagement(equipmentId) {
+ return request({
+ url: '/eqp/equipmentManagement/' + equipmentId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/equipmentParam.js b/klp-ui/src/api/mes/eqp/equipmentParam.js
new file mode 100644
index 00000000..288055b2
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/equipmentParam.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备参数列表
+export function listEquipmentParam(query) {
+ return request({
+ url: '/eqp/equipmentParam/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备参数详细
+export function getEquipmentParam(paramId) {
+ return request({
+ url: '/eqp/equipmentParam/' + paramId,
+ method: 'get'
+ })
+}
+
+// 新增设备参数
+export function addEquipmentParam(data) {
+ return request({
+ url: '/eqp/equipmentParam',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备参数
+export function updateEquipmentParam(data) {
+ return request({
+ url: '/eqp/equipmentParam',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备参数
+export function delEquipmentParam(paramId) {
+ return request({
+ url: '/eqp/equipmentParam/' + paramId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/equipmentType.js b/klp-ui/src/api/mes/eqp/equipmentType.js
new file mode 100644
index 00000000..aa6431cf
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/equipmentType.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备类型列表
+export function listEquipmentType(query) {
+ return request({
+ url: '/eqp/equipmentType/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备类型详细
+export function getEquipmentType(typeId) {
+ return request({
+ url: '/eqp/equipmentType/' + typeId,
+ method: 'get'
+ })
+}
+
+// 新增设备类型
+export function addEquipmentType(data) {
+ return request({
+ url: '/eqp/equipmentType',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备类型
+export function updateEquipmentType(data) {
+ return request({
+ url: '/eqp/equipmentType',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备类型
+export function delEquipmentType(typeId) {
+ return request({
+ url: '/eqp/equipmentType/' + typeId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/inspectedEquipment.js b/klp-ui/src/api/mes/eqp/inspectedEquipment.js
new file mode 100644
index 00000000..0a28fd9c
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/inspectedEquipment.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询待检设备列表
+export function listInspectedEquipment(query) {
+ return request({
+ url: '/eqp/inspectedEquipment/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询待检设备详细
+export function getInspectedEquipment(inspectId) {
+ return request({
+ url: '/eqp/inspectedEquipment/' + inspectId,
+ method: 'get'
+ })
+}
+
+// 新增待检设备
+export function addInspectedEquipment(data) {
+ return request({
+ url: '/eqp/inspectedEquipment',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改待检设备
+export function updateInspectedEquipment(data) {
+ return request({
+ url: '/eqp/inspectedEquipment',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除待检设备
+export function delInspectedEquipment(inspectId) {
+ return request({
+ url: '/eqp/inspectedEquipment/' + inspectId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/inspectionRecord.js b/klp-ui/src/api/mes/eqp/inspectionRecord.js
new file mode 100644
index 00000000..df7cccd4
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/inspectionRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检修记录列表
+export function listInspectionRecord(query) {
+ return request({
+ url: '/eqp/inspectionRecord/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询检修记录详细
+export function getInspectionRecord(recordId) {
+ return request({
+ url: '/eqp/inspectionRecord/' + recordId,
+ method: 'get'
+ })
+}
+
+// 新增检修记录
+export function addInspectionRecord(data) {
+ return request({
+ url: '/eqp/inspectionRecord',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改检修记录
+export function updateInspectionRecord(data) {
+ return request({
+ url: '/eqp/inspectionRecord',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除检修记录
+export function delInspectionRecord(recordId) {
+ return request({
+ url: '/eqp/inspectionRecord/' + recordId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/sparePart.js b/klp-ui/src/api/mes/eqp/sparePart.js
new file mode 100644
index 00000000..9cfdee21
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/sparePart.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备品备件列表
+export function listSparePart(query) {
+ return request({
+ url: '/eqp/sparePart/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询备品备件详细
+export function getSparePart(partId) {
+ return request({
+ url: '/eqp/sparePart/' + partId,
+ method: 'get'
+ })
+}
+
+// 新增备品备件
+export function addSparePart(data) {
+ return request({
+ url: '/eqp/sparePart',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改备品备件
+export function updateSparePart(data) {
+ return request({
+ url: '/eqp/sparePart',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除备品备件
+export function delSparePart(partId) {
+ return request({
+ url: '/eqp/sparePart/' + partId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/sparePartsChange.js b/klp-ui/src/api/mes/eqp/sparePartsChange.js
new file mode 100644
index 00000000..7c50a947
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/sparePartsChange.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备品备件变动记录列表
+export function listSparePartsChange(query) {
+ return request({
+ url: '/eqp/sparePartsChange/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询备品备件变动记录详细
+export function getSparePartsChange(changeId) {
+ return request({
+ url: '/eqp/sparePartsChange/' + changeId,
+ method: 'get'
+ })
+}
+
+// 新增备品备件变动记录
+export function addSparePartsChange(data) {
+ return request({
+ url: '/eqp/sparePartsChange',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改备品备件变动记录
+export function updateSparePartsChange(data) {
+ return request({
+ url: '/eqp/sparePartsChange',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除备品备件变动记录
+export function delSparePartsChange(changeId) {
+ return request({
+ url: '/eqp/sparePartsChange/' + changeId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/api/mes/eqp/typeParam.js b/klp-ui/src/api/mes/eqp/typeParam.js
new file mode 100644
index 00000000..ab0a6243
--- /dev/null
+++ b/klp-ui/src/api/mes/eqp/typeParam.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备类型参数(某类设备的通用参数标准)列表
+export function listTypeParam(query) {
+ return request({
+ url: '/eqp/typeParam/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备类型参数(某类设备的通用参数标准)详细
+export function getTypeParam(typeParamId) {
+ return request({
+ url: '/eqp/typeParam/' + typeParamId,
+ method: 'get'
+ })
+}
+
+// 新增设备类型参数(某类设备的通用参数标准)
+export function addTypeParam(data) {
+ return request({
+ url: '/eqp/typeParam',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备类型参数(某类设备的通用参数标准)
+export function updateTypeParam(data) {
+ return request({
+ url: '/eqp/typeParam',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备类型参数(某类设备的通用参数标准)
+export function delTypeParam(typeParamId) {
+ return request({
+ url: '/eqp/typeParam/' + typeParamId,
+ method: 'delete'
+ })
+}
diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 6cb98fdf..7a817ba5 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -1556,8 +1556,8 @@ body {
background: $--metal-gradient-light;
border-color: $--border-color-light;
color: $--color-text-regular;
- padding: 2px 8px;
- border-radius: 2px;
+ padding: 2px 4px;
+ border-radius: 4px;
font-size: 12px;
height: auto;
margin-right: 0;
@@ -1573,7 +1573,7 @@ body {
.cell & {
margin-right: 0;
padding: 1px !important;
- border-radius: 0 !important;
+ border-radius: 4px !important;
}
}
diff --git a/klp-ui/src/views/mes/eqp/checking/checked.vue b/klp-ui/src/views/mes/eqp/checking/checked.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/eqp/checking/index.vue b/klp-ui/src/views/mes/eqp/checking/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/eqp/device/index.vue b/klp-ui/src/views/mes/eqp/device/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/eqp/device/stop.vue b/klp-ui/src/views/mes/eqp/device/stop.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/eqp/ready/index.vue b/klp-ui/src/views/mes/eqp/ready/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/eqp/type/index.vue b/klp-ui/src/views/mes/eqp/type/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/mes/qc/history/index.vue b/klp-ui/src/views/mes/qc/history/index.vue
index 043a7c0d..63089d3f 100644
--- a/klp-ui/src/views/mes/qc/history/index.vue
+++ b/klp-ui/src/views/mes/qc/history/index.vue
@@ -38,9 +38,12 @@
-
- {{ scope.row.inspectionResult === 0 ? '未检验' : (scope.row.inspectionResult === 1 ? '合格' : (scope.row.inspectionResult === 2 ? '不合格' : '')) }}
-
+
+ 未检验
+ 合格
+ 不合格
+ 未知
+
@@ -96,14 +99,12 @@
-
- 未检测
- 通过
- 不通过
- 未知
-
+
+ 未检测
+ 通过
+ 不通过
+ 未知
+
diff --git a/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue b/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue
index aba12ead..18b11d7e 100644
--- a/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue
@@ -49,13 +49,12 @@
-
- 未检验
- 合格
- 不合格
- 未知
-
+
+ 未检验
+ 合格
+ 不合格
+ 未知
+
@@ -103,19 +102,19 @@
-
- 未检测
- 通过
- 不通过
- 未知
-
+
+ 未检测
+ 通过
+ 不通过
+ 未知
+
- 通过
- 不通过
diff --git a/klp-ui/src/views/mes/qc/task/pages/lab.vue b/klp-ui/src/views/mes/qc/task/pages/lab.vue
index bb920a5c..f4da63b4 100644
--- a/klp-ui/src/views/mes/qc/task/pages/lab.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/lab.vue
@@ -45,13 +45,12 @@
-
- 未检验
- 合格
- 不合格
- 未知
-
+
+ 未检验
+ 合格
+ 不合格
+ 未知
+
@@ -99,19 +98,19 @@
-
- 未检测
- 通过
- 不通过
- 未知
-
+
+ 未检测
+ 通过
+ 不通过
+ 未知
+
- 通过
- 不通过
diff --git a/klp-ui/src/views/mes/qc/task/pages/raw.vue b/klp-ui/src/views/mes/qc/task/pages/raw.vue
index 18d7dda6..26141cf9 100644
--- a/klp-ui/src/views/mes/qc/task/pages/raw.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/raw.vue
@@ -51,13 +51,12 @@
-
- 未检验
- 合格
- 不合格
- 未知
-
+
+ 未检验
+ 合格
+ 不合格
+ 未知
+
@@ -105,19 +104,19 @@
-
- 未检测
- 通过
- 不通过
- 未知
-
+
+ 未检测
+ 通过
+ 不通过
+ 未知
+
- 通过
- 不通过
diff --git a/klp-ui/src/views/mes/qc/task/pages/section.vue b/klp-ui/src/views/mes/qc/task/pages/section.vue
index 87b91248..f5e4a007 100644
--- a/klp-ui/src/views/mes/qc/task/pages/section.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/section.vue
@@ -45,13 +45,12 @@
-
- 未检验
- 合格
- 不合格
- 未知
-
+
+ 未检验
+ 合格
+ 不合格
+ 未知
+
@@ -99,19 +98,19 @@
-
- 未检测
- 通过
- 不通过
- 未知
-
+
+ 未检测
+ 通过
+ 不通过
+ 未知
+
- 通过
- 不通过