diff --git a/src/api/mes/dv/machinery.js b/src/api/mes/dv/machinery.js
new file mode 100644
index 0000000..84f56a3
--- /dev/null
+++ b/src/api/mes/dv/machinery.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备列表
+export function listMachinery(query) {
+ return request({
+ url: '/mes/dv/machinery/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备详细
+export function getMachinery(machineryId) {
+ return request({
+ url: '/mes/dv/machinery/' + machineryId,
+ method: 'get'
+ })
+}
+
+// 新增设备
+export function addMachinery(data) {
+ return request({
+ url: '/mes/dv/machinery',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备
+export function updateMachinery(data) {
+ return request({
+ url: '/mes/dv/machinery',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备
+export function delMachinery(machineryId) {
+ return request({
+ url: '/mes/dv/machinery/' + machineryId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/mes/md/workshop.js b/src/api/mes/md/workshop.js
index 0e3be05..0aa7e99 100644
--- a/src/api/mes/md/workshop.js
+++ b/src/api/mes/md/workshop.js
@@ -9,6 +9,13 @@ export function listWorkshop(query) {
})
}
+export function listAllWorkshop(){
+ return request({
+ url: '/mes/md/workshop/listAll',
+ method: 'get'
+ })
+}
+
// 查询车间详细
export function getWorkshop(workshopId) {
return request({
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
new file mode 100644
index 0000000..9772750
--- /dev/null
+++ b/src/views/mes/dv/machinery/index.vue
@@ -0,0 +1,598 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导入
+
+
+ 导出
+
+
+
+
+
+
+
+
+ {{scope.row.machineryCode}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处,或点击上传
+
+
+ 是否更新已经存在的设备数据
+
+
仅允许导入xls、xlsx格式文件。
+
下载模板
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 1b5a3be..3b865ce 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -209,9 +209,9 @@ export default {
/** 查询设备类型下拉树结构 */
getTreeselect() {
listMachinerytype().then(response => {
+ debugger;
this.machinerytypeOptions = [];
- const data = { machineryTypeId: 0, machineryTypeName: '顶级节点', children: [] };
- data.children = this.handleTree(response.data, "machineryTypeId", "parentTypeId");
+ const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
this.machinerytypeOptions.push(data);
});
},