diff --git a/src/api/deviceConsole/index.js b/src/api/deviceConsole/index.js new file mode 100644 index 0000000..14ccd66 --- /dev/null +++ b/src/api/deviceConsole/index.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 获取用户详细信息 +export function devices() { + return request({ + url: '/device/devices', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/assets/images/close.png b/src/assets/images/close.png new file mode 100644 index 0000000..0230a0a Binary files /dev/null and b/src/assets/images/close.png differ diff --git a/src/assets/images/machine.png b/src/assets/images/machine.png new file mode 100644 index 0000000..3574e3a Binary files /dev/null and b/src/assets/images/machine.png differ diff --git a/src/assets/images/open.png b/src/assets/images/open.png new file mode 100644 index 0000000..acf6e2d Binary files /dev/null and b/src/assets/images/open.png differ diff --git a/src/views/deviceConsole/machine/index.vue b/src/views/deviceConsole/machine/index.vue new file mode 100644 index 0000000..da26bf2 --- /dev/null +++ b/src/views/deviceConsole/machine/index.vue @@ -0,0 +1,663 @@ + + + + + + + + 选择设备 + + + 暂无数据 + + {{ item.machineryName }} + + + + + + + + + + + + + + + + + {{ intelligentData.feedSpeed }} + + + + {{ intelligentData.spindleSpeed }} + + + + + {{ intelligentData.rapidOverride }} + + + + {{ intelligentData.spindle }} + + + + + {{ intelligentData.feedRate }} + + + + {{ intelligentData.handWheel }} + + + + + + + + {{ intelligentData.relativeX }} + + + + {{ intelligentData.machineX }} + + + + + {{ intelligentData.relativeY }} + + + + {{ intelligentData.machineY }} + + + + + {{ intelligentData.relativeZ }} + + + + {{ intelligentData.machineZ }} + + + + + {{ intelligentData.relativeA }} + + + + {{ intelligentData.machineA }} + + + + + + + + {{ intelligentData.absoluteX }} + + + + {{ intelligentData.residualX }} + + + + + {{ intelligentData.absoluteY }} + + + + {{ intelligentData.residualY }} + + + + + {{ intelligentData.absoluteZ }} + + + + {{ intelligentData.residualZ }} + + + + + {{ intelligentData.absoluteA }} + + + + {{ intelligentData.residualA }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue index 72b128e..523c185 100644 --- a/src/views/mes/dv/machinery/index.vue +++ b/src/views/mes/dv/machinery/index.vue @@ -329,6 +329,40 @@ + + + + + + + + + + + + + + @@ -765,8 +799,8 @@ export default { this.open = true; this.title = "新增设备"; genCode("MACHINERY_CODE").then((response) => { - this.form.machineryCode = response; - }); + this.form.machineryCode = response; + }); }, saveInvolvedUserId() {
暂无数据